diff --git a/defaults/main.yml b/defaults/main.yml
index c4b7667..e3bcc12 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -1,10 +1,2 @@
 ---
 # defaults file for jitsi
-docker_user: deploy
-#jitsi_letsencrypt_email:alice@host.tld
-jitsi_enable_letsencrypt: False
-jitsi_exposed_http_port: 8000
-jitsi_exposed_https_port: 8443
-jitsi_virtual_host: localhost
-jitsi_public_url: http://{{ jitsi_virtual_host }}
-jitsi_timezone: Europe/Amsterdam
\ No newline at end of file
diff --git a/tasks/main.yml b/tasks/main.yml
index cb25842..b0afd5d 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -52,6 +52,10 @@
     that:
       - "output.ansible_facts['web']['jitsi_web_1'].state.running"
 
+- name: Get container IP
+  set_fact:
+    jitsi_container_ip: "{{ output.ansible_facts['web']['jitsi_web_1']['networks']['jitsi_meet.jitsi'].IPAddress }}"
+
 - name: "Waiting for Jitsi container to become available"
   become: false
   wait_for:
diff --git a/templates/env.jitsi.j2 b/templates/env.jitsi.j2
index 5281d34..e0bcf79 100644
--- a/templates/env.jitsi.j2
+++ b/templates/env.jitsi.j2
@@ -22,21 +22,19 @@ VIRTUAL_HOST={{ jitsi_virtual_host }}
 # in the README.
 DOCKER_HOST_ADDRESS={{ jitsi_docker_host_address }}
 
-{% if jitsi_enable_letsencrypt %}
 #
 # Let's Encrypt configuration
 #
 
 # Enable Let's Encrypt certificate generation.
-ENABLE_LETSENCRYPT=0
+ENABLE_LETSENCRYPT={{ 1 if jitsi_enable_letsencrypt == True else 0 }}
 
 # Domain for which to generate the certificate.
-LETSENCRYPT_DOMAIN={{ jitsi_virtual_host }}
+#LETSENCRYPT_DOMAIN=meet.example.com
 
 # E-Mail for receiving important account notifications (mandatory).
-LETSENCRYPT_EMAIL={{ jitsi_letsencrypt_email }}
+#LETSENCRYPT_EMAIL=alice@atlanta.net
 
-{% endif -%}
 
 #
 # Etherpad integration (for document sharing)