diff --git a/.github/workflows/base.yml b/.github/workflows/base.yml
index 52d696a..221bc85 100644
--- a/.github/workflows/base.yml
+++ b/.github/workflows/base.yml
@@ -13,11 +13,11 @@ jobs:
       - uses: actions/checkout@v2
 
       - name: Log into Github registry
-        run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login docker.pkg.github.com -u ${{ github.actor }} --password-stdin
+        run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u ${{ github.actor }} --password-stdin
 
       - name: Build base run image
         run: |
-          IMAGE_ID=docker.pkg.github.com/${{ github.repository }}/base-run:$GITHUB_SHA
+          IMAGE_ID=ghcr.io/${{ github.repository }}/base-run:$GITHUB_SHA
           docker build . -f docker/Dockerfile.base-run --tag base-run
           docker tag base-run $IMAGE_ID
           docker push $IMAGE_ID
@@ -25,7 +25,7 @@ jobs:
 
       - name: Build base build image
         run: |
-          IMAGE_ID=docker.pkg.github.com/${{ github.repository }}/base-build:$GITHUB_SHA
+          IMAGE_ID=ghcr.io/${{ github.repository }}/base-build:$GITHUB_SHA
           docker build . -f docker/Dockerfile.base-build --tag $IMAGE_ID
           docker push $IMAGE_ID
           echo Pushed new base build image $IMAGE_ID
diff --git a/.github/workflows/runtime.yml b/.github/workflows/runtime.yml
index dc6d81f..2cf1bf3 100644
--- a/.github/workflows/runtime.yml
+++ b/.github/workflows/runtime.yml
@@ -13,7 +13,7 @@ jobs:
       - uses: actions/checkout@v2
 
       - name: Log into Github registry
-        run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login docker.pkg.github.com -u ${{ github.actor }} --password-stdin
+        run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u ${{ github.actor }} --password-stdin
 
       - name: Build image
         run: docker build . -f docker/Dockerfile.runtime --tag image
diff --git a/docker/Dockerfile.runtime b/docker/Dockerfile.runtime
index 3ca04c6..5662936 100644
--- a/docker/Dockerfile.runtime
+++ b/docker/Dockerfile.runtime
@@ -1,10 +1,10 @@
-FROM docker.pkg.github.com/fpco/stackage-server/base-build:37eb5f3da608d3796a5176a3c27fe83f340690e7 as build-app
+FROM ghcr.io/fpco/stackage-server/base-build:37eb5f3da608d3796a5176a3c27fe83f340690e7 as build-app
 
 RUN mkdir -p /artifacts/bin
 COPY . /src
 RUN stack install --stack-yaml /src/stack.yaml --local-bin-path /artifacts/bin
 
-FROM docker.pkg.github.com/fpco/stackage-server/base-run:37eb5f3da608d3796a5176a3c27fe83f340690e7
+FROM ghcr.io/fpco/stackage-server/base-run:37eb5f3da608d3796a5176a3c27fe83f340690e7
 
 COPY --from=build-app /src/config/ /app/config/
 COPY --from=build-app /src/static/ /app/static/