diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2f42f19..7c24bce 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,18 +3,30 @@ All notable changes to this project will be documented in this file.
 
 ## [Unreleased]
 
-## [1.1.1] 2017-01-11
+## [1.2.0](https://github.com/idealista-tech/solrcloud-role/tree/1.2.0) (2017-01-27)
+[Full Changelog](https://github.com/idealista-tech/solrcloud-role/compare/1.1.1...1.2.0)
+
+### Added
+- *#8 Set JVM args by configuration* @jmonterrubio
+
+## [1.1.1](https://github.com/idealista-tech/solrcloud-role/tree/1.1.1) (2017-01-11)
+[Full Changelog](https://github.com/idealista-tech/solrcloud-role/compare/1.1.0...1.1.1)
+
 ### Fixed
 - *#4 Copy solr.xml file for not default data dir* @jmonterrubio
 
-## [1.1.0]
+## [1.1.0](https://github.com/idealista-tech/solrcloud-role/tree/1.1.0)
+[Full Changelog](https://github.com/idealista-tech/solrcloud-role/compare/1.0.1...1.1.0)
+
 ### Added
 - *#1 Enable all the jetty HttpConfiguration parameters from ansible* @jmonterrubio
 
 ### Fixed
 - *Renamed solrcloud-role in tests playbook* @jmonterrubio
 
-## [1.0.1]
+## [1.0.1](https://github.com/idealista-tech/solrcloud-role/tree/1.0.1)
+[Full Changelog](https://github.com/idealista-tech/solrcloud-role/compare/1.0.0...1.0.1)
+
 ### Fixed
 - *JMX enable* @jmonterrubio
 
@@ -24,6 +36,6 @@ All notable changes to this project will be documented in this file.
 - *Code refactor* @jmonterrubio
 - *Update SolrCloud sources repository* @jmonterrubio
 
-## [1.0.0]
+## [1.0.0](https://github.com/idealista-tech/solrcloud-role/tree/1.0.0)
 ### Added
 - *First commit* @jmonterrubio
diff --git a/defaults/main.yml b/defaults/main.yml
index 83c76d6..a2b85d1 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -21,6 +21,25 @@ solr_jmx_enabled: 'true'
 solr_jmx_port: 1099
 solr_host: "{{ hostvars[ansible_nodename]['ansible_' + ansible_default_ipv4.alias]['ipv4']['address'] }}"
 
+solr_gc_tune: "-XX:NewRatio=3 \
+-XX:SurvivorRatio=4 \
+-XX:TargetSurvivorRatio=90 \
+-XX:MaxTenuringThreshold=8 \
+-XX:+UseConcMarkSweepGC \
+-XX:+UseParNewGC \
+-XX:ConcGCThreads=4 -XX:ParallelGCThreads=4 \
+-XX:+CMSScavengeBeforeRemark \
+-XX:PretenureSizeThreshold=64m \
+-XX:+UseCMSInitiatingOccupancyOnly \
+-XX:CMSInitiatingOccupancyFraction=50 \
+-XX:CMSMaxAbortablePrecleanTime=6000 \
+-XX:+CMSParallelRemarkEnabled \
+-XX:+ParallelRefProcEnabled \
+-XX:+AggressiveOpts \
+-XX:+UseFastAccessorMethods \
+-XX:+UseTLAB"
+solr_stack_size: 256k
+
 solr_heap: 512m
 solr_jetty_threads_min: 10
 solr_jetty_threads_max: 10000
diff --git a/templates/solr.in.sh.j2 b/templates/solr.in.sh.j2
index 87a2cf4..ddc01f3 100644
--- a/templates/solr.in.sh.j2
+++ b/templates/solr.in.sh.j2
@@ -30,20 +30,7 @@ GC_LOG_OPTS="-verbose:gc -XX:+PrintHeapAtGC -XX:+PrintGCDetails \
 -XX:+PrintGCDateStamps -XX:+PrintGCTimeStamps -XX:+PrintTenuringDistribution -XX:+PrintGCApplicationStoppedTime"
 
 # These GC settings have shown to work well for a number of common Solr workloads
-GC_TUNE="-XX:NewRatio=3 \
--XX:SurvivorRatio=4 \
--XX:TargetSurvivorRatio=90 \
--XX:MaxTenuringThreshold=8 \
--XX:+UseConcMarkSweepGC \
--XX:+UseParNewGC \
--XX:ConcGCThreads=4 -XX:ParallelGCThreads=4 \
--XX:+CMSScavengeBeforeRemark \
--XX:PretenureSizeThreshold=64m \
--XX:+UseCMSInitiatingOccupancyOnly \
--XX:CMSInitiatingOccupancyFraction=50 \
--XX:CMSMaxAbortablePrecleanTime=6000 \
--XX:+CMSParallelRemarkEnabled \
--XX:+ParallelRefProcEnabled"
+GC_TUNE="{{ solr_gc_tune }}"
 
 # Set the ZooKeeper connection string if using an external ZooKeeper ensemble
 # e.g. host1:2181,host2:2181/chroot
@@ -69,7 +56,7 @@ ENABLE_REMOTE_JMX_OPTS="{{ solr_jmx_enabled }}"
 RMI_PORT={{ solr_jmx_port }}
 
 # Set the thread stack size
-SOLR_OPTS="$SOLR_OPTS -Xss256k"
+SOLR_OPTS="$SOLR_OPTS -Xss{{ solr_stack_size }}"
 
 # Anything you add to the SOLR_OPTS variable will be included in the java
 # start command line as-is, in ADDITION to other options. If you specify the