diff --git a/.github/workflows/build-docker-images.yml b/.github/workflows/build-docker-images.yml
index fddf8316db8f..9d26c8695845 100644
--- a/.github/workflows/build-docker-images.yml
+++ b/.github/workflows/build-docker-images.yml
@@ -86,6 +86,7 @@ jobs:
         with:
           platforms: ${{ inputs.platforms }}
       - name: Login to Docker Hub
+        if: ${{ inputs.push }}
         uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
@@ -94,7 +95,7 @@ jobs:
         id: meta
         uses: docker/metadata-action@v5
         with:
-          images: ${{ secrets.DOCKERHUB_ORGANIZATION_NAME }}/${{ inputs.image-name }}
+          images: ${{ secrets.DOCKERHUB_ORGANIZATION_NAME || 'powerdns' }}/${{ inputs.image-name }}
           tags: ${{ inputs.image-tags }}
       - name: Build and load powerdns product images
         id: build-image
diff --git a/Dockerfile-auth b/Dockerfile-auth
index ca2bafaa76c1..59caf8864423 100644
--- a/Dockerfile-auth
+++ b/Dockerfile-auth
@@ -33,10 +33,10 @@ ADD configure.ac Makefile.am /source/
 COPY builder/helpers/set-configure-ac-version.sh /usr/local/bin
 
 ARG MAKEFLAGS=
-ENV MAKEFLAGS ${MAKEFLAGS:--j2}
+ENV MAKEFLAGS=${MAKEFLAGS:--j2}
 
 ARG DOCKER_FAKE_RELEASE=NO
-ENV DOCKER_FAKE_RELEASE ${DOCKER_FAKE_RELEASE}
+ENV DOCKER_FAKE_RELEASE=${DOCKER_FAKE_RELEASE}
 
 RUN if [ "${DOCKER_FAKE_RELEASE}" = "YES" ]; then \
       BUILDER_VERSION="$(IS_RELEASE=YES BUILDER_MODULES=authoritative ./builder-support/gen-version | sed 's/\([0-9]\+\.[0-9]\+\.[0-9]\+\(\(alpha|beta|rc\)\d\+\)\)?.*/\1/')" set-configure-ac-version.sh;\
diff --git a/Dockerfile-dnsdist b/Dockerfile-dnsdist
index 100b0d617bef..26af8e851111 100644
--- a/Dockerfile-dnsdist
+++ b/Dockerfile-dnsdist
@@ -28,10 +28,10 @@ COPY .git /source/.git
 WORKDIR /source/pdns/dnsdistdist
 
 ARG MAKEFLAGS=
-ENV MAKEFLAGS ${MAKEFLAGS:--j2}
+ENV MAKEFLAGS=${MAKEFLAGS:--j2}
 
 ARG DOCKER_FAKE_RELEASE=NO
-ENV DOCKER_FAKE_RELEASE ${DOCKER_FAKE_RELEASE}
+ENV DOCKER_FAKE_RELEASE=${DOCKER_FAKE_RELEASE}
 
 RUN touch dnsdist.1 # avoid having to install pandoc and venv
 
diff --git a/Dockerfile-recursor b/Dockerfile-recursor
index 0a083917fd7f..a5a33a0d684f 100644
--- a/Dockerfile-recursor
+++ b/Dockerfile-recursor
@@ -36,10 +36,10 @@ RUN cd /source/ && ./install_rust.sh
 WORKDIR /source/pdns/recursordist
 
 ARG MAKEFLAGS=
-ENV MAKEFLAGS ${MAKEFLAGS:--j2}
+ENV MAKEFLAGS=${MAKEFLAGS:--j2}
 
 ARG DOCKER_FAKE_RELEASE=NO
-ENV DOCKER_FAKE_RELEASE ${DOCKER_FAKE_RELEASE}
+ENV DOCKER_FAKE_RELEASE=${DOCKER_FAKE_RELEASE}
 
 # Manpage deps
 # RUN apt-get install -y python3-venv && apt-get clean