diff --git a/.github/workflows/publish-develop-docker.yml b/.github/workflows/publish-develop-dockerhub.yml
similarity index 74%
rename from .github/workflows/publish-develop-docker.yml
rename to .github/workflows/publish-develop-dockerhub.yml
index 35195f46..7d0f7979 100644
--- a/.github/workflows/publish-develop-docker.yml
+++ b/.github/workflows/publish-develop-dockerhub.yml
@@ -1,4 +1,4 @@
-name: Publish Develop Docker Image
+name: Publish Develop to DockerHub
 
 on:
     push:
@@ -23,8 +23,3 @@ jobs:
               with:
                   push: true
                   tags: archmonger/conreq:develop
-            - name: Push to GitHub Container Registry
-              uses: matootie/github-docker@v3.0.0
-              with:
-                  accessToken: ${{ github.token }}
-                  tag: develop
diff --git a/.github/workflows/publish-develop-ghcr.yml b/.github/workflows/publish-develop-ghcr.yml
new file mode 100644
index 00000000..12606dd5
--- /dev/null
+++ b/.github/workflows/publish-develop-ghcr.yml
@@ -0,0 +1,26 @@
+name: Publish Develop to GHCR
+
+on:
+    push:
+        branches:
+            - develop
+
+jobs:
+    docker:
+        runs-on: ubuntu-latest
+        steps:
+            - name: Set up QEMU
+              uses: docker/setup-qemu-action@v3
+            - name: Set up Docker Buildx
+              uses: docker/setup-buildx-action@v3
+            - name: Login to GitHub Container Registry
+              uses: docker/login-action@v3
+              with:
+                  registry: ghcr.io
+                  username: ${{ github.actor }}
+                  password: ${{ github.token }}
+            - name: Build and push to GitHub Container Registry
+              uses: docker/build-push-action@v6
+              with:
+                  push: true
+                  tags: ghcr.io/archmonger/conreq:develop
diff --git a/.github/workflows/publish-latest-docker.yml b/.github/workflows/publish-latest-dockerhub.yml
similarity index 70%
rename from .github/workflows/publish-latest-docker.yml
rename to .github/workflows/publish-latest-dockerhub.yml
index 2d2a1941..f8a28aba 100644
--- a/.github/workflows/publish-latest-docker.yml
+++ b/.github/workflows/publish-latest-dockerhub.yml
@@ -1,4 +1,4 @@
-name: Publish Latest Docker Image
+name: Publish Latest to DockerHub
 
 on:
     release:
@@ -22,10 +22,3 @@ jobs:
               with:
                   push: true
                   tags: archmonger/conreq:latest,archmonger/conreq:${{ github.event.release.tag_name }}
-            - name: Push to GitHub Container Registry
-              uses: matootie/github-docker@v3.0.0
-              with:
-                  accessToken: ${{ github.token }}
-                  tag: |
-                      latest
-                      ${{ github.event.release.tag_name }}
diff --git a/.github/workflows/publish-latest-ghcr.yml b/.github/workflows/publish-latest-ghcr.yml
new file mode 100644
index 00000000..6a80b6d5
--- /dev/null
+++ b/.github/workflows/publish-latest-ghcr.yml
@@ -0,0 +1,25 @@
+name: Publish Latest to GHCR
+
+on:
+    release:
+        types: [published]
+
+jobs:
+    docker:
+        runs-on: ubuntu-latest
+        steps:
+            - name: Set up QEMU
+              uses: docker/setup-qemu-action@v3
+            - name: Set up Docker Buildx
+              uses: docker/setup-buildx-action@v3
+            - name: Login to Docker Hub
+              uses: docker/login-action@v3
+              with:
+                  registry: ghcr.io
+                  username: ${{ github.actor }}
+                  password: ${{ github.token }}
+            - name: Build and push to Docker Hub
+              uses: docker/build-push-action@v6
+              with:
+                  push: true
+                  tags: ghcr.io/archmonger/conreq:latest,ghcr.io/archmonger/conreq:${{ github.event.release.tag_name }}