diff --git a/ansible/group_vars/all b/ansible/group_vars/all
index 6baada9..c93d464 100644
--- a/ansible/group_vars/all
+++ b/ansible/group_vars/all
@@ -4,6 +4,6 @@
 proxy_url2: http://{{ facter_ipaddress_eth1 }}
 registry_url: 10.100.198.220:5000/
 jenkins_ip: 10.100.198.220
-debian_version: trusty
+debian_version: xenial
 docker_cfg: docker.cfg
 docker_cfg_dest: /etc/default/docker
diff --git a/ansible/java/tasks/main.yml b/ansible/java/tasks/main.yml
index beb4211..cbeb786 100644
--- a/ansible/java/tasks/main.yml
+++ b/ansible/java/tasks/main.yml
@@ -1,5 +1,5 @@
 - name: Package is present
   apt:
-    name=openjdk-7-jdk
+    name=openjdk-8-jdk
     state=present
   tags: [java]
diff --git a/ansible/roles/common/defaults/main.yml b/ansible/roles/common/defaults/main.yml
index c97c39d..82f5092 100644
--- a/ansible/roles/common/defaults/main.yml
+++ b/ansible/roles/common/defaults/main.yml
@@ -6,6 +6,7 @@
   - debian-keyring
   - debian-archive-keyring
   - python-dev
+  - kafkacat
   - libssl-dev
   - libffi-dev
   - libpcap-dev