diff --git a/README.md b/README.md
index 3220f94..e2ae4fd 100644
--- a/README.md
+++ b/README.md
@@ -19,7 +19,6 @@ Role Variables
 | jitsi_install_user                   | The user who is going to manage/run the Docker Compose services                                                                                             | {{ ansible_user }}                             |
 | jitsi_install_path                   | The location where the service should be deployed                                                                                                           | /home/{{ jitsi_install_user }}                 |
 | jitsi_multitenant_label              | A label (unique accross all instances on this host) identifying the tenant                                                                                  |                                                |
-| jitsi_docker_image_tag               | Tag that should be used for the jitsi-docker images. If `jitsi_docker_upstream_repo_url` is set, this shall be left at `latest`.                            | latest                                         | 
 | jitsi_build_latest_image_from_source | Will fetch the master of `jitsi_docker_upstream_repo_url` and build the docker image as sometimes the latest available images in the Docker Hub are too old | yes                                            |
 | jitsi_docker_upstream_repo_url       | Git repo of docker-jitsi-meet required by `jitsi_build_latest_image_from_source`                                                                            | https://github.com/jitsi/docker-jitsi-meet.git |
 | *jitsi_letsencrypt_email*            | E-Mail adress used for requesting certificates                                                                                                              | Not set                                        |
diff --git a/defaults/main.yml b/defaults/main.yml
index 1df8945..f339808 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -3,9 +3,6 @@
 jitsi_install_user: '{{ ansible_user }}' # This user must be present on the host
 jitsi_install_path: '/home/{{ jitsi_install_user }}'
 jitsi_multitenant_label: 
-jitsi_docker_image_tag: 'latest'
-jitsi_build_latest_image_from_source: yes
-jitsi_docker_upstream_repo_url: https://github.com/jitsi/docker-jitsi-meet.git
 #jitsi_letsencrypt_email:alice@host.tld
 jitsi_enable_letsencrypt: no
 jitsi_exposed_http_port: 8000
@@ -17,6 +14,8 @@ jitsi_public_url: http://{{ jitsi_virtual_host }}
 jitsi_timezone: Europe/Amsterdam
 jitsi_jvb_stun_servers: meet-jit-si-turnrelay.jitsi.net:443
 jitsi_web_channel_last_n: 3
+jitsi_build_latest_image_from_source: yes
+jitsi_docker_upstream_repo_url: https://github.com/jitsi/docker-jitsi-meet.git
 jitsi_enable_third_party_requests: no
 jitsi_expose_metrics: False
 # Internal variables
diff --git a/templates/docker-compose.jitsi.yml.j2 b/templates/docker-compose.jitsi.yml.j2
index 5e6b8a0..7f5a8c8 100644
--- a/templates/docker-compose.jitsi.yml.j2
+++ b/templates/docker-compose.jitsi.yml.j2
@@ -3,7 +3,7 @@ version: '3'
 services:
     # Frontend
     web:
-        image: jitsi/web:{{ jitsi_docker_image_tag }}
+        image: jitsi/web
         restart: unless-stopped
         volumes:
             - ${CONFIG}/web:/config
@@ -60,7 +60,7 @@ services:
 
     # XMPP server
     prosody:
-        image: jitsi/prosody:{{ jitsi_docker_image_tag }}
+        image: jitsi/prosody
         restart: unless-stopped
         expose:
             - '5222'
@@ -125,7 +125,7 @@ services:
 
     # Focus component
     jicofo:
-        image: jitsi/jicofo:{{ jitsi_docker_image_tag }}
+        image: jitsi/jicofo
         restart: unless-stopped
         volumes:
             - ${CONFIG}/jicofo:/config
@@ -152,7 +152,7 @@ services:
 
     # Video bridge
     jvb:
-        image: jitsi/jvb:{{ jitsi_docker_image_tag }}
+        image: jitsi/jvb
         restart: unless-stopped
         ports:
             - '${JVB_PORT}:${JVB_PORT}/udp'
diff --git a/templates/etherpad.yml b/templates/etherpad.yml
index 188d3d9..200f669 100644
--- a/templates/etherpad.yml
+++ b/templates/etherpad.yml
@@ -3,7 +3,7 @@ version: '3'
 services:
     # Etherpad: real-time collaborative document editing
     etherpad:
-        image: jitsi/etherpad:{{ jitsi_docker_image_tag }}
+        image: jitsi/etherpad
         restart: unless-stopped
         networks:
             meet.jitsi:
diff --git a/templates/jibri.yml b/templates/jibri.yml
index 2a1dee3..3efbc8b 100644
--- a/templates/jibri.yml
+++ b/templates/jibri.yml
@@ -2,7 +2,7 @@ version: '3'
 
 services:
     jibri:
-        image: jitsi/jibri:{{ jitsi_docker_image_tag }}
+        image: jitsi/jibri
         restart: unless-stopped
         volumes:
             - ${CONFIG}/jibri:/config
diff --git a/templates/jigasi.yml b/templates/jigasi.yml
index b2094c0..0bcf1d2 100644
--- a/templates/jigasi.yml
+++ b/templates/jigasi.yml
@@ -3,7 +3,7 @@ version: '3'
 services:
     # SIP gateway (audio)
     jigasi:
-        image: jitsi/jigasi:{{ jitsi_docker_image_tag }}
+        image: jitsi/jigasi
         restart: unless-stopped
         ports:
             - '${JIGASI_PORT_MIN}-${JIGASI_PORT_MAX}:${JIGASI_PORT_MIN}-${JIGASI_PORT_MAX}/udp'