diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 8e297cda2..2b5f1d5c4 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -288,7 +288,7 @@ jobs:
         name: Prepare
         id: prepare
         run: |
-          IMAGE_NAME=jonaswinkler/paperless-ng
+          IMAGE_NAME=paperless-ngx/paperless-ngx
           if [[ $GITHUB_REF == refs/tags/ng-* ]]; then
             TAGS=${IMAGE_NAME}:${GITHUB_REF#refs/tags/ng-},${IMAGE_NAME}:latest
             INSPECT_TAG=${IMAGE_NAME}:latest
@@ -324,11 +324,12 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-buildx-
       -
-        name: Login to DockerHub
+        name: Login to Github Container Registry
         uses: docker/login-action@v1
         with:
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
       -
         name: Build and push
         uses: docker/build-push-action@v2