diff --git a/Makefile b/Makefile
index 64395d6..ba07238 100644
--- a/Makefile
+++ b/Makefile
@@ -280,7 +280,7 @@ publish-container: ## Helper target to push a given image to a registry. Default
 		version=$${version%.*} ; \
 		docker push $(docker_repo)/kopano_$(component):$$version ; \
 	done
-	docker push $(docker_repo)/kopano_$(component):latest
+	#docker push $(docker_repo)/kopano_$(component):latest
 #ifdef DOCKERREADME
 #	bash .ci/docker-hub-helper.sh $(component)
 #endif
diff --git a/docker-compose.mail.yml b/docker-compose.mail.yml
index 342479f..d34a285 100644
--- a/docker-compose.mail.yml
+++ b/docker-compose.mail.yml
@@ -4,8 +4,8 @@ services:
   mail:
     image: tvial/docker-mailserver:release-v6.2.0
     restart: unless-stopped
-    hostname: mail
-    domainname: ${LDAP_DOMAIN}
+    #hostname: mail
+    #domainname: ${LDAP_DOMAIN}
     container_name: ${COMPOSE_PROJECT_NAME}_mail
     ports:
       - "${SMTPPORT:-25}:25"
diff --git a/docker-compose.yml b/docker-compose.yml
index 2bea9ec..5891a02 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -257,8 +257,8 @@ services:
     image: ${docker_repo:-zokradonh}/kopano_core:${CORE_VERSION:-latest}
     read_only: true
     restart: unless-stopped
-    hostname: spooler
-    domainname: ${LDAP_DOMAIN}
+    #hostname: spooler
+    #domainname: ${LDAP_DOMAIN}
     depends_on:
       - kopano_server
     volumes: