diff --git a/lib/autodiscover.sh b/lib/autodiscover.sh
index c49ea52..41eddc7 100644
--- a/lib/autodiscover.sh
+++ b/lib/autodiscover.sh
@@ -18,7 +18,7 @@ version: '3.7'
 
 services:
   autodiscover:
-    image: monogramm/autodiscover-email-settings:latest
+    image: monogramm/autodiscover-email-settings:\${IMAGE_VERSION}
     container_name: autodiscover
     hostname: autodiscover.$DOMAIN
     domainname: $DOMAIN
@@ -30,7 +30,7 @@ services:
       - ./.env
     labels:
       - "traefik.enable=true"
-      - "traefik.http.routers.autodiscover.rule=Host(`autoconfig.$DOMAIN`,`autodiscover.$DOMAIN`)"
+      - "traefik.http.routers.autodiscover.rule=Host(\`autoconfig.$DOMAIN\`,\`autodiscover.$DOMAIN\`)"
       - "traefik.http.routers.autodiscover.entrypoints=websecure"
       - "traefik.http.routers.autodiscover.tls.certresolver=letsencrypt"
       - "traefik.http.services.autodiscover.loadbalancer.server.port=8000"
@@ -83,11 +83,11 @@ docker exec -it pdns pdnsutil add-record $DOMAIN autodiscover A 86400 $EXTERNALI
 [ $? -ne 0 ] && fail "Couldn't add dns record for auto discovery"
 docker exec -it pdns pdnsutil add-record $DOMAIN @ TXT 86400 "\"mailconf=https://autoconfig.$DOMAIN/mail/config-v1.1.xml\""
 [ $? -ne 0 ] && fail "Couldn't add dns record for auto discovery"
-docker exec -it pdns pdnsutil add-record $DOMAIN _imaps._tcp SRV "0 0 993 mail.$DOMAIN"
+docker exec -it pdns pdnsutil add-record $DOMAIN _imaps._tcp SRV 86400 "0 0 993 mail.$DOMAIN"
 [ $? -ne 0 ] && fail "Couldn't add dns record for auto discovery"
-docker exec -it pdns pdnsutil add-record $DOMAIN _pop3s._tcp SRV "0 0 995 mail.$DOMAIN"
+docker exec -it pdns pdnsutil add-record $DOMAIN _pop3s._tcp SRV 86400 "0 0 995 mail.$DOMAIN"
 [ $? -ne 0 ] && fail "Couldn't add dns record for auto discovery"
-docker exec -it pdns pdnsutil add-record $DOMAIN _imaps._tcp SRV "0 0 993 mail.$DOMAIN"
+docker exec -it pdns pdnsutil add-record $DOMAIN _imaps._tcp SRV 86400 "0 0 993 mail.$DOMAIN"
 [ $? -ne 0 ] && fail "Couldn't add dns record for auto discovery"
 docker exec -it pdns pdnsutil add-record $DOMAIN _submission._tcp SRV 86400 "0 0 587 $DOMAIN"
 [ $? -ne 0 ] && fail "Couldn't add dns record for auto discovery"