diff --git a/.docker/release/test/config.yaml b/.docker/release/test/config.yaml
index b265dea6d..47cf00ea9 100644
--- a/.docker/release/test/config.yaml
+++ b/.docker/release/test/config.yaml
@@ -16,9 +16,9 @@ commandTests:
           pidof php-fpm
           ls -al /var/lib/snappymail/_data_/_default_/configs/application.ini
           ls -al /var/lib/snappymail/_data_/_default_/admin_password.txt
-          nc -vz localhost 8888
-          nc -vz localhost 9000
-          wget -S -T 3 -O /dev/null http://localhost:8888
+          nc -vz 127.0.0.1 8888
+          nc -vz 127.0.0.1 9000
+          wget -S -T 3 -O /dev/null http://127.0.0.1:8888
           kill `pidof supervisord`
 metadataTest:
   exposedPorts: ["8888", "9000"]
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 25ee2d5b0..69be3c05d 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -68,6 +68,7 @@ jobs:
         password: ${{ secrets.DOCKERHUB_TOKEN }}
 
     - name: Login to GitHub Container Registry
+      if: startsWith(github.ref, 'refs/tags/')  # Login only on tags
       uses: docker/login-action@v2
       with:
         registry: ghcr.io