diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2a767af..1eb3902 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,9 @@ All notable changes to this project will be documented in this file.
 
 ## [Unreleased](https://github.com/idealista/solrcloud-role/tree/develop)
 
+### 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/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>