diff --git a/defaults/main.yml b/defaults/main.yml
index 34f1417..902377f 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -1,7 +1,9 @@
 ---
 apache_mirror: http://apache.mirrors.tds.net
 kafka_hosts: "{{ansible_fqdn}}:9092"
-kafka_version: 0.8.1.1
+kafka_version: 0.10.2.0
+kafka_branch: 2.11
+kafka_url: "https://nexus.ncrsmb.com/repository/momentum-infrastructure/kafka_{{kafka_branch}}/{{kafka_version}}/"
 run_mode: Deploy
 skip_install: False
 
@@ -20,9 +22,13 @@ kafka_log_segment_bytes: "{{kafka_log_retention_bytes}}"
 kafka_log_cleanup_interval_mins: 1
 kafka_heap_opts: "-Xmx1G -Xms1G"
 kafka_tarball_location: /root
-kafka_tarball_name: "kafka_2.9.2-{{kafka_version}}.tgz"
+kafka_staging_dir: ./tarballs
+kafka_tarball_name: "kafka_{{kafka_branch}}-{{kafka_version}}.tgz"
+java_version: "7"
 monasca_wait_for_period: 30
 monasca_log_level: WARN
 zookeeper_connection_timeout_ms: 1000000
 
+jmx_port: 9999
+
 verify: True
diff --git a/tasks/configure.yml b/tasks/configure.yml
index 6ddd88f..16815e6 100644
--- a/tasks/configure.yml
+++ b/tasks/configure.yml
@@ -6,13 +6,13 @@
   user: name={{kafka_user}} system=yes group={{kafka_group}}
 
 - name: Uncompress the kafka tar
-  unarchive: copy=no creates=/opt/kafka_2.9.2-{{kafka_version}} dest=/opt src="{{ kafka_tarball_location }}/{{ kafka_tarball_name }}"
+  unarchive: copy=no creates=/opt/kafka_{{kafka_branch}}-{{kafka_version}} owner={{kafka_user}} group={{kafka_group}} dest=/opt src="{{ kafka_tarball_location }}/{{ kafka_tarball_name }}"
 
 - name: Link /opt/kafka to the right version
-  file: path=/opt/kafka state=link src=/opt/kafka_2.9.2-{{kafka_version}}
+  file: path=/opt/kafka state=link src=/opt/kafka_{{kafka_branch}}-{{kafka_version}}
 
 - name: Overwrite the start script so the Java Opts can be changed if Kafka 0.8.1.1
-  lineinfile: dest=/opt/kafka_2.9.2-{{kafka_version}}/bin/kafka-server-start.sh regexp="^export KAFKA_HEAP_OPTS=" line="export KAFKA_HEAP_OPTS=\"{{ kafka_heap_opts }}\""
+  lineinfile: dest=/opt/kafka_{{kafka_branch}}-{{kafka_version}}/bin/kafka-server-start.sh regexp="^export KAFKA_HEAP_OPTS=" line="export KAFKA_HEAP_OPTS=\"{{ kafka_heap_opts }}\""
   notify:
     - restart kafka
   when: kafka_version == "0.8.1.1"
diff --git a/tasks/install.yml b/tasks/install.yml
index a26d148..f37ca8f 100644
--- a/tasks/install.yml
+++ b/tasks/install.yml
@@ -1,6 +1,7 @@
 ---
-- name: Install OpenJDK
-  apt: name=openjdk-7-jre-headless state=present
+#- name: Install OpenJDK
+#  apt: name=openjdk-{{java_version}}-jre-headless state=present
+#  when: java_version != 'none'
 
 - name: Fetch kafka binary package
-  get_url: dest="{{ kafka_tarball_location }}/{{ kafka_tarball_name }}" url="{{apache_mirror}}/kafka/{{kafka_version}}/{{kafka_tarball_name}}"
+  get_url: dest="{{ kafka_staging_dir }}/{{ kafka_tarball_name }}" url="{{kafka_url}}/{{kafka_tarball_name}}"
diff --git a/templates/kafka.service.j2 b/templates/kafka.service.j2
index 89f6117..24bdf01 100644
--- a/templates/kafka.service.j2
+++ b/templates/kafka.service.j2
@@ -8,7 +8,7 @@ User=kafka
 Group=kafka
 LimitNOFILE=32768
 Restart=on-failure
-Environment="KAFKA_HEAP_OPTS={{ kafka_heap_opts }}"
+Environment="KAFKA_HEAP_OPTS={{ kafka_heap_opts }}" "JMX_PORT={{ jmx_port }}"
 ExecStart=/opt/kafka/bin/kafka-server-start.sh /etc/kafka/server.properties
 
 [Install]