diff --git a/.github/workflows/publish-docker.yml b/.github/workflows/publish-docker.yml
index 01862987..3fd2f79e 100644
--- a/.github/workflows/publish-docker.yml
+++ b/.github/workflows/publish-docker.yml
@@ -49,13 +49,21 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-buildx-
 
-      - name: Docker Login
+      - name: Login to DockerHub
         uses: docker/login-action@v1
         if: success()
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
 
+      - name: Login to GitHub Container Registry
+        uses: docker/login-action@v1
+        if: success()
+        with:
+          registry: ghcr.io
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.GHCR_TOKEN }}
+
       - name: Docker Build and Push
         uses: docker/build-push-action@v2
         if: success()
@@ -69,15 +77,12 @@ jobs:
             BRANCH=${{ steps.prepare.outputs.branch }}
             COMMIT=${{ steps.prepare.outputs.commit }}
             BUILD_DATE=${{ steps.prepare.outputs.build_date }}
-          tags: ${{ steps.prepare.outputs.docker_image }}:${{ steps.prepare.outputs.tag }}
+          tags: |
+            ${{ steps.prepare.outputs.docker_image }}:${{ steps.prepare.outputs.tag }}
+            ghcr.io/${{ steps.prepare.outputs.docker_image }}:${{ steps.prepare.outputs.tag }}
           cache-from: type=local,src=/tmp/.buildx-cache
           cache-to: type=local,dest=/tmp/.buildx-cache
 
-      - name: Clear
-        if: always()
-        run: |
-          rm -f ${HOME}/.docker/config.json
-
       - name: Post Status to Discord
         uses: sarisia/actions-status-discord@v1
         if: always()