diff --git a/host-krypton.yml b/host-krypton.yml
index 53204f8..ea226e4 100644
--- a/host-krypton.yml
+++ b/host-krypton.yml
@@ -9,7 +9,6 @@
 
     docker_ip_ranges: ["172.16.0.0/12", "192.168.0.0/16"]
 
-    openldap_image_version: 1.5.0
     openldap_data: "{{ data_dir }}/openldap"
     openldap_domain: "ldap.n39.eu"
     ldap_domain: "netz39.de"
@@ -52,7 +51,7 @@
     - name: Ensure container for openLDAP is running.
       docker_container:
         name: openLDAP
-        image: "osixia/openldap:{{ openldap_image_version }}"
+        image: osixia/openldap:1.5.0
         detach: yes
         state: started
         restart_policy: unless-stopped
diff --git a/host-pottwal.yml b/host-pottwal.yml
index 1cf335d..f6db66c 100644
--- a/host-pottwal.yml
+++ b/host-pottwal.yml
@@ -84,7 +84,7 @@
     - name: Ensure apt-cacher container is running
       docker_container:
         name: apt_cacher_ng
-        image: "mrtux/apt-cacher-ng"
+        image: mrtux/apt-cacher-ng:latest
         pull: true
         state: started
         restart_policy: unless-stopped
diff --git a/host-radon.yml b/host-radon.yml
index 6f6f68f..f58c12c 100644
--- a/host-radon.yml
+++ b/host-radon.yml
@@ -13,13 +13,13 @@
     nodered_image: nodered/node-red:3.0.1-1-18
     nodered_data: "{{ data_dir }}/nodered"
 
-    rabbitmq_image: "bitnami/rabbitmq:3.10.7"
+    rabbitmq_image: bitnami/rabbitmq:3.10.7
     rabbitmq_data: "{{ data_dir }}/rabbitmq"
 
-    pwr_meter_pulse_gw_image: "netz39/power-meter-pulse-gateway:0.3.0"
+    pwr_meter_pulse_gw_image: netz39/power-meter-pulse-gateway:0.3.0
 
     brotherql_host_port: 9004
-    brotherql_web_image: "pklaus/brother_ql_web:alpine_9e20b6d"
+    brotherql_web_image: pklaus/brother_ql_web:alpine_9e20b6d
 
   roles:
     # role 'docker_setup' applied through group 'docker_host'
diff --git a/host-tau.yml b/host-tau.yml
index 6defba2..d5b3495 100644
--- a/host-tau.yml
+++ b/host-tau.yml
@@ -14,7 +14,7 @@
     dokuwiki_port: 9005
     # This container is pinned, because there are issues
     # with backwards compatibility within the same tag!
-    dokuwiki_image: "bitnami/dokuwiki:20220731@sha256:989ab52cf2d2e0f84166e114ca4ce88f59546b8f6d34958905f8d81c18cbd759"
+    dokuwiki_image: bitnami/dokuwiki:20220731@sha256:989ab52cf2d2e0f84166e114ca4ce88f59546b8f6d34958905f8d81c18cbd759
 
     discord_invite_domain: discord.netz39.de
 
@@ -100,7 +100,7 @@
     - name: Setup Docker Registry Container
       docker_container:
         name: registry
-        image: "registry:2"
+        image: registry:2
         pull: true
         state: started
         restart_policy: unless-stopped
@@ -167,7 +167,7 @@
     - name: Setup container for secondary FFMD DNS
       docker_container:
         name: bind9-md-freifunk-net
-        image: "ffmd/bind9-md-freifunk-net:2022111601"
+        image: ffmd/bind9-md-freifunk-net:2022111601
         pull: true
         state: started
         restart_policy: unless-stopped
diff --git a/host-unicorn.yml b/host-unicorn.yml
index 2780230..1c2a186 100644
--- a/host-unicorn.yml
+++ b/host-unicorn.yml
@@ -13,7 +13,7 @@
     - name: Setup the docker container for unifi-controller
       docker_container:
         name: unifi-controller
-        image: "jacobalberty/unifi:v7.1.65"
+        image: jacobalberty/unifi:v7.1.65
         state: started
         restart_policy: unless-stopped
         container_default_behavior: no_defaults