diff --git a/.github/workflows/dockerpublish.yml b/.github/workflows/dockerpublish.yml
index 2ec3340..aedc935 100644
--- a/.github/workflows/dockerpublish.yml
+++ b/.github/workflows/dockerpublish.yml
@@ -42,7 +42,7 @@ jobs:
         uses: docker/setup-buildx-action@v1
 
       - name: Login to Docker Hub
-        if: ${{ (github.repository == 'laradock/workspace') }}
+        if: ${{ (github.repository == 'laradock/workspace') && (github.ref == 'refs/heads/master') }}
         uses: docker/login-action@v1
         with:
           username: ${{ secrets.DOCKER_HUB_USER }}
@@ -53,5 +53,5 @@ jobs:
         with:
           file: Dockerfile-${{ matrix.php_version }}
           platforms: linux/amd64,linux/arm64,linux/386
-          push: ${{ (github.repository == 'laradock/workspace') }}
+          push: ${{ (github.repository == 'laradock/workspace') && (github.ref == 'refs/heads/master') }}
           tags: ${{ steps.meta.outputs.tags }}
diff --git a/Dockerfile-8.0 b/Dockerfile-8.0
index 63ffaf1..9ecec16 100644
--- a/Dockerfile-8.0
+++ b/Dockerfile-8.0
@@ -63,6 +63,7 @@ RUN set -eux \
         tree \
         postgresql-client \
     && apt-get clean \
+    && update-alternatives --set php /usr/bin/php8.0 \
     #####################################
     # Composer:
     #####################################