diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2a767af..95238d3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,12 @@ All notable changes to this project will be documented in this file.
 
 ## [Unreleased](https://github.com/idealista/solrcloud-role/tree/develop)
 
+## [1.5.1](https://github.com/idealista/solrcloud-role/tree/1.5.1) (2017-04-21)
+[Full Changelog](https://github.com/idealista/solrcloud-role/compare/1.5.0...1.5.1)
+
+### Fixed
+- *[#21](https://github.com/idealista/solrcloud-role/issues/21) Fixing Acceptor/Selector thread configuration in jetty-http template* @dortegau
+
 ## [1.5.0](https://github.com/idealista/solrcloud-role/tree/1.5.0) (2017-03-31)
 [Full Changelog](https://github.com/idealista/solrcloud-role/compare/1.4.0...1.5.0)
 
diff --git a/README.md b/README.md
index b323af6..18c8268 100644
--- a/README.md
+++ b/README.md
@@ -31,9 +31,9 @@ For testing purposes, [Molecule](https://molecule.readthedocs.io/) with [Vagrant
 Create or add to your roles dependency file (e.g requirements.yml):
 
 ```
-- src: http://github.com/idealista-tech/solrcloud-role.git
+- src: http://github.com/idealista/solrcloud-role.git
   scm: git
-  version: 1.0.0
+  version: 1.5.1
   name: solrcloud
 ```
 
@@ -49,8 +49,7 @@ Use in a playbook:
 ---
 - hosts: someserver
   roles:
-    - { role: solrcloud
-      }
+    - { role: solrcloud }
 ```
 
 ## Usage
@@ -69,15 +68,15 @@ molecule test
 
 ## Versioning
 
-For the versions available, see the [tags on this repository](https://github.com/idealista-tech/solrcloud-role/tags).
+For the versions available, see the [tags on this repository](https://github.com/idealista/solrcloud-role/tags).
 
 Additionaly you can see what change in each version in the [CHANGELOG.md](CHANGELOG.md) file.
 
 ## Authors
 
-* **Idealista** - *Work with* - [idealista-tech](https://github.com/idealista-tech)
+* **Idealista** - *Work with* - [idealista](https://github.com/idealista)
 
-See also the list of [contributors](https://github.com/idealista-tech/solrcloud-role/contributors) who participated in this project.
+See also the list of [contributors](https://github.com/idealista/solrcloud-role/contributors) who participated in this project.
 
 ## License
 
diff --git a/templates/jetty-http.xml.j2 b/templates/jetty-http.xml.j2
index b6e1bae..b4aab42 100644
--- a/templates/jetty-http.xml.j2
+++ b/templates/jetty-http.xml.j2
@@ -22,8 +22,8 @@
     <Arg>
       <New class="org.eclipse.jetty.server.ServerConnector">
         <Arg name="server"><Ref refid="Server" /></Arg>
-        <Arg name="acceptors" type="int"><Property name="solr.jetty.http.acceptors" default="-1"/>{{ solr_jetty_http_acceptors }}</Arg>
-        <Arg name="selectors" type="int"><Property name="solr.jetty.http.selectors" default="-1"/>{{ solr_jetty_http_selectors }}</Arg>
+        <Arg name="acceptors" type="int"><Property name="solr.jetty.http.acceptors" default="{{ solr_jetty_http_acceptors }}"/></Arg>
+        <Arg name="selectors" type="int"><Property name="solr.jetty.http.selectors" default="{{ solr_jetty_http_selectors }}"/></Arg>
         <Arg name="factories">
           <Array type="org.eclipse.jetty.server.ConnectionFactory">
             <Item>