diff --git a/config/nginx/inbox_location b/config/nginx/inbox_location
index 6a3f84a..b7d09ac 100644
--- a/config/nginx/inbox_location
+++ b/config/nginx/inbox_location
@@ -11,7 +11,7 @@ location ~ \.php$ {
     fastcgi_keep_conn on;
     fastcgi_split_path_info ^(.+\.php)(.*)$;
     fastcgi_index index.php;
-    fastcgi_pass inbox.zathura.leene.dev;
+    fastcgi_pass inbox.leene.dev;
     fastcgi_param PATH_INFO $fastcgi_path_info;
     fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
     include fastcgi_params;
diff --git a/config/nginx/nextcloud_location b/config/nginx/nextcloud_location
index aa6ec63..1e0cee9 100644
--- a/config/nginx/nextcloud_location
+++ b/config/nginx/nextcloud_location
@@ -49,7 +49,7 @@ location ~ ^\/(?:index|remote|public|cron|core\/ajax\/update|status|ocs\/v[12]|u
     fastcgi_param modHeadersAvailable true;
     # Enable pretty urls
     fastcgi_param front_controller_active true;
-    fastcgi_pass nextcloud.zathura.leene.dev;
+    fastcgi_pass nextcloud.leene.dev;
     fastcgi_intercept_errors on;
     fastcgi_request_buffering off;
 }
diff --git a/docker-compose.yaml b/docker-compose.yaml
index b446520..4eb0ddd 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -92,11 +92,11 @@ services:
       - VIRTUAL_PORT=3000
       - LETSENCRYPT_HOST=git.${NGINX_HOST}
       - GITEA__mailer__PASSWD=${SQL_PSWD}
-      - GITEA__server__DOMAIN           = git.${NGINX_HOST}
-      - GITEA__server__SSH_DOMAIN       = git.${NGINX_HOST}
-      - GITEA__server__ROOT_URL         = https://git.${NGINX_HOST}/
-      - GITEA__server__CERT_FILE        = /etc/letsencrypt/live/git.${NGINX_HOST}.crt
-      - GITEA__server__KEY_FILE         = /etc/letsencrypt/live/git.${NGINX_HOST}.key
+      - GITEA__server__DOMAIN=git.${NGINX_HOST}
+      - GITEA__server__SSH_DOMAIN=git.${NGINX_HOST}
+      - GITEA__server__ROOT_URL=https://git.${NGINX_HOST}/
+      - GITEA__server__CERT_FILE=/etc/letsencrypt/live/git.${NGINX_HOST}.crt
+      - GITEA__server__KEY_FILE=/etc/letsencrypt/live/git.${NGINX_HOST}.key
     volumes:
       - gitea_data:/data:z
       - nginx_certs:/etc/letsencrypt/live:ro,z
@@ -139,6 +139,11 @@ services:
     hostname: inbox
     domainname: ${NGINX_HOST}
     environment:
+      - VIRTUAL_HOST=mail.${NGINX_HOST}
+      - LETSENCRYPT_HOST=mail.${NGINX_HOST}
+      - SSL_TYPE=manual
+      - SSL_CERT_PATH=/etc/letsencrypt/live/mail.${NGINX_HOST}.crt
+      - SSL_KEY_PATH=/etc/letsencrypt/live/mail.${NGINX_HOST}.key
       - POSTMASTER_ADDRESS=admin@${NGINX_HOST}
       - RELAY_PASSWORD=${SENDGRID_APIKEY}
     ports:
@@ -200,6 +205,7 @@ services:
       - HOSTNAME=${NGINX_HOST}
       - USERNAME=${GDNS_USERNAME}
       - PASSWORD=${GDNS_PASSWORD}
+      - INTERVAL=9000
 
   autodiscover:
     <<: *defaults
@@ -211,11 +217,8 @@ services:
       - LETSENCRYPT_HOST=autodiscover.${NGINX_HOST},autoconfig.${NGINX_HOST}
       - DOMAIN=${NGINX_HOST}
       - IMAP_HOST=mail.${NGINX_HOST}
-      - IMAP_PORT=993
+      - IMAP_PORT=1993
       - IMAP_SOCKET=SSL
-      - POP_HOST=mail.${NGINX_HOST}
-      - POP_PORT=995
-      - POP_SOCKET=SSL
       - SMTP_HOST=mail.${NGINX_HOST}
       - SMTP_PORT=587
       - SMTP_SOCKET=STARTTLS
diff --git a/local.env b/local.env
index 4c51e6c..3c9f9d0 100644
--- a/local.env
+++ b/local.env
@@ -1,8 +1,6 @@
 ## Docker Env
 PERMIT_DOCKER=network
 
-## Google Dynamic DNS
-INTERVAL=900
 
 ## Mail Server Env
 POSTFIX_INET_PROTOCOLS=ipv4
@@ -16,12 +14,11 @@ ENABLE_SASLAUTHD=0
 ONE_DIR=1
 TLS_LEVEL=modern
 ENABLE_UPDATE_CHECK=1
-SSL_TYPE=letsencrypt
 SPOOF_PROTECTION=1
-ENABLE_POP3=1
 POSTSCREEN_ACTION=ignore
 ENABLE_DNSBL=0
 ENABLE_QUOTAS=0
+ENABLE_POP3=0
 
 RELAY_HOST=smtp.sendgrid.net
 RELAY_PORT=587