diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml
index e99b25a..66e62a7 100644
--- a/.github/workflows/docker-build.yml
+++ b/.github/workflows/docker-build.yml
@@ -8,7 +8,7 @@ on:
     types: [published]
 
 env:
-  IMAGE_NAME: paessler/multi-platform-probe
+  IMAGE_NAME: dselen/multi-platform-probe
 
 jobs:
   docker_build:
@@ -28,6 +28,18 @@ jobs:
           - name: ghcr
             registry: "ghcr.io"
     steps:
+      - name: Set image for Docker
+        id: set-image
+        run: |
+          if [ "${{ matrix.variant.name }}" = "ghcr" ]; then
+            echo "IMAGE_TO_USE=${GITHUB_REPOSITORY}" >> $GITHUB_ENV
+          elif [ "${{ matrix.variant.name }}" == "dockerhub" ]; then
+            echo "IMAGE_TO_USE=${IMAGE_NAME}" >> $GITHUB_ENV
+          else
+            echo "Failing to resolve."
+            exit 1
+          fi
+
       - name: Check out the repository
         uses: actions/checkout@v5
 
@@ -43,6 +55,7 @@ jobs:
         uses: docker/setup-buildx-action@v3
 
       - name: Log in to Docker Hub
+        if: matrix.variant.name == 'dockerhub'
         uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
@@ -50,6 +63,7 @@ jobs:
           registry: ${{ matrix.variant.registry }}
 
       - name: Log in to Github Container Registry
+        if: matrix.variant.name == 'ghcr'
         uses: docker/login-action@v3
         with:
           username: ${{ github.actor }}
@@ -60,9 +74,7 @@ jobs:
         id: meta
         uses: docker/metadata-action@v5
         with:
-          images: |
-            ${{ env.IMAGE_NAME }}
-            ${{ github.repository }}
+          images: ${{ matrix.variant.registry }}/${{ env.IMAGE_TO_USE }}
           tags: |
             type=ref,event=branch
             type=ref,event=tag
@@ -77,10 +89,7 @@ jobs:
           push: true
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
-          platforms: |
-            - linux/amd64
-            - linux/arm64
-            - linux/arm/v7
+          platforms: linux/amd64,linux/arm64,linux/arm/v7
 
       - name: Generate artifact attestation
         if: matrix.variant.name == 'dockerhub'
@@ -94,6 +103,6 @@ jobs:
         if: matrix.variant.name == 'ghcr'
         uses: actions/attest-build-provenance@v1
         with:
-          subject-name: ${{ matrix.variant.registry }}/${{ env.IMAGE_NAME }}
+          subject-name: ${{ matrix.variant.registry }}/${{ github.repository }}
           subject-digest: ${{ steps.push.outputs.digest }}
-          push-to-registry: true
\ No newline at end of file
+          push-to-registry: true
diff --git a/.github/workflows/dockerhub.yml b/.github/workflows/dockerhub.yml
index 9207d6a..3f91013 100644
--- a/.github/workflows/dockerhub.yml
+++ b/.github/workflows/dockerhub.yml
@@ -3,8 +3,8 @@
 name: Push to Docker Hub
 
 on:
-  release:
-    types: [published]
+#  release:
+#    types: [published]
 
 env:
   IMAGE_NAME: paessler/multi-platform-probe
diff --git a/.github/workflows/github.yml b/.github/workflows/github.yml
index 3d1e146..ecad5eb 100644
--- a/.github/workflows/github.yml
+++ b/.github/workflows/github.yml
@@ -3,9 +3,9 @@
 name: Push to GitHub
 
 on:
-  push:
-    branches: ["main"]
-    tags: ["*"]
+#  push:
+#    branches: ["main"]
+#    tags: ["*"]
 
 env:
   REGISTRY: ghcr.io