diff --git a/.github/workflows/container_build.yml b/.github/workflows/container_build.yml
index d2b5938..013167f 100644
--- a/.github/workflows/container_build.yml
+++ b/.github/workflows/container_build.yml
@@ -18,9 +18,6 @@ jobs:
         with:
           fetch-depth: 0
 
-      - name: Free Disk Space (Ubuntu)
-        uses: jlumbroso/free-disk-space@main
-
       - name: Setup up docker buildx
         uses: docker/setup-buildx-action@v2
 
diff --git a/.github/workflows/container_upload.yml b/.github/workflows/container_upload.yml
index d7c9fde..82b77c1 100644
--- a/.github/workflows/container_upload.yml
+++ b/.github/workflows/container_upload.yml
@@ -22,9 +22,6 @@ jobs:
         with:
           fetch-depth: 0
 
-      - name: Free Disk Space (Ubuntu)
-        uses: jlumbroso/free-disk-space@main
-
       - name: Setup up docker buildx
         uses: docker/setup-buildx-action@v2
 
@@ -41,5 +38,5 @@ jobs:
           context: docker
           push: true
           tags: |
-            ghcr.io/${{ github.repository_owner.lowercase }}/tmate-minimal:latest
+            ghcr.io/statfungen/tmate-minimal:latest
           outputs: type=image,compression=zstd,push=true
diff --git a/.github/workflows/dispatch_container_upload.yml b/.github/workflows/dispatch_container_upload.yml
index bd1b218..49c0a41 100644
--- a/.github/workflows/dispatch_container_upload.yml
+++ b/.github/workflows/dispatch_container_upload.yml
@@ -1,4 +1,4 @@
-name: Push containers to registries
+name: Dispatch push containers to registries
 
 on:
   workflow_dispatch:
@@ -18,9 +18,6 @@ jobs:
         with:
           fetch-depth: 0
 
-      - name: Free Disk Space (Ubuntu)
-        uses: jlumbroso/free-disk-space@main
-
       - name: Setup up docker buildx
         uses: docker/setup-buildx-action@v2
 
@@ -37,5 +34,5 @@ jobs:
           context: docker
           push: true
           tags: |
-            ghcr.io/${{ github.repository_owner.lowercase }}/tmate-minimal:latest
+            ghcr.io/statfungen/tmate-minimal:latest
           outputs: type=image,compression=zstd,push=true