diff --git a/.ci/docker-hub-helper.sh b/.ci/docker-hub-helper.sh
index 2542c22..57944e3 100755
--- a/.ci/docker-hub-helper.sh
+++ b/.ci/docker-hub-helper.sh
@@ -10,6 +10,9 @@ tmpfile=$(mktemp /tmp/kopano-docker-env.XXXXXX)
 cp ./.env "$tmpfile"
 sed -i '/LDAP_QUERY_FILTER/s/^/#/g' "$tmpfile"
 sed -i '/SASLAUTHD_LDAP_FILTER/s/^/#/g' "$tmpfile"
+sed -i '/KCUNCOMMENT_LDAP_1/s/^/#/g' "$tmpfile"
+sed -i '/KCCOMMENT_LDAP_1/s/^/#/g' "$tmpfile"
+
 # shellcheck disable=SC1090
 source "$tmpfile"
 
diff --git a/.travis.yml b/.travis.yml
index 3617207..7515ece 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -28,7 +28,9 @@ script:
   - make test-startup-meet-demo
 deploy:
   - provider: script
-    script: make publish
+    skip-cleanup: true
+    script:
+      - make publish
     on:
       branch: master
 #cache: # uncomment to not load/upload trivy files each time
diff --git a/owncloud/owncloud.sh b/owncloud/owncloud.sh
index d707dd7..6d1574e 100755
--- a/owncloud/owncloud.sh
+++ b/owncloud/owncloud.sh
@@ -19,6 +19,9 @@ tmpfile=$(mktemp /tmp/kopano-docker-env.XXXXXX)
 cp ../.env "$tmpfile"
 sed -i '/LDAP_QUERY_FILTER/s/^/#/g' "$tmpfile"
 sed -i '/SASLAUTHD_LDAP_FILTER/s/^/#/g' "$tmpfile"
+sed -i '/KCUNCOMMENT_LDAP_1/s/^/#/g' "$tmpfile"
+sed -i '/KCCOMMENT_LDAP_1/s/^/#/g' "$tmpfile"
+
 # shellcheck disable=SC1090
 source "$tmpfile"