diff --git a/.travis.yml b/.travis.yml
index 8532bab..1b9bbb3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,8 +11,8 @@ env:
   matrix:
     - MOLECULE_PLATFORM: debian-9
     - MOLECULE_PLATFORM: debian-10
-    - MOLECULE_PLATFORM: ubuntu-16.04
     - MOLECULE_PLATFORM: ubuntu-18.04
+    - MOLECULE_PLATFORM: ubuntu-20.04
 
 before_script:
   - wget https://raw.githubusercontent.com/nl2go/docker-molecule/3.0.4-n2g-1.0.0/docker-compose.yml
diff --git a/defaults/main.yml b/defaults/main.yml
index 237439a..2841b59 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -1,5 +1,5 @@
 ---
-kafka_apache_mirror_base_url: https://mirror.netcologne.de/apache.org
+kafka_apache_mirror_base_url: https://archive.apache.org/dist
 kafka_enable_topic_deletion: true
 kafka_user: kafka
 kafka_group: kafka
diff --git a/molecule/default/molecule.yml b/molecule/default/molecule.yml
index 8f0f441..fa83ab6 100644
--- a/molecule/default/molecule.yml
+++ b/molecule/default/molecule.yml
@@ -56,6 +56,9 @@ provisioner:
         kafka_jmx_host: localhost
         kafka_jmx_username: jmx
         kafka_jmx_password: molecule
+        kafka_listener_security_protocol_map: "SASL_PLAINTEXT:SASL_PLAINTEXT,REPLICATION:SASL_PLAINTEXT"
+        kafka_listeners: "SASL_PLAINTEXT://{{ kafka_host }}:9092,REPLICATION://{{ kafka_host }}:9093"
+        kafka_inter_broker_listener_name: "REPLICATION"
     host_vars:
       "${MOLECULE_TEST_SCOPE:-default}-kfk-1":
         kafka_broker_id: 1
@@ -64,11 +67,11 @@ provisioner:
       "${MOLECULE_TEST_SCOPE:-default}-kfk-3":
         kafka_broker_id: 3
       "${MOLECULE_TEST_SCOPE:-default}-zk-1":
-        zookeeper_member_id: 1
+        zookeeper_member_id: "{{ ansible_default_ipv4.address }}"
       "${MOLECULE_TEST_SCOPE:-default}-zk-2":
-        zookeeper_member_id: 2
+        zookeeper_member_id: "{{ ansible_default_ipv4.address }}"
       "${MOLECULE_TEST_SCOPE:-default}-zk-3":
-        zookeeper_member_id: 3
+        zookeeper_member_id: "{{ ansible_default_ipv4.address }}"
   lint: |
     set -e
     ansible-lint
diff --git a/molecule/resources/requirements.yml b/molecule/resources/requirements.yml
index acc8daa..0170865 100644
--- a/molecule/resources/requirements.yml
+++ b/molecule/resources/requirements.yml
@@ -3,4 +3,4 @@
   version: 1.0.0
 
 - src: nl2go.zookeeper
-  version: 1.0.0
+  version: 1.1.2
diff --git a/templates/server.properties.j2 b/templates/server.properties.j2
index 71ca68d..f97db74 100644
--- a/templates/server.properties.j2
+++ b/templates/server.properties.j2
@@ -52,7 +52,7 @@ advertised.listeners={{ kafka_advertised_listeners }}
 # when a topic is deleted it stay in a pending state forever. When set to true the topic 
 # is immediately deleted when the delete action is trigered.
 {% if kafka_enable_topic_deletion is defined %}
-delete.topic.enable="{{ kafka_enable_topic_deletion }}"
+delete.topic.enable={{ kafka_enable_topic_deletion | lower }}
 {% endif %}
 
 # Maps listener names to security protocols, the default is for them to be the same. See the config documentation for more details