diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index a0b8d4c..69a5332 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -29,12 +29,12 @@ jobs:
       - name: Login to Docker
         uses: docker/login-action@v1
         with:
-          registry: docker.pkg.github.com
+          registry: ghcr.io
           username: ${{ github.actor }}
           password: ${{ github.token }}
       - name: Image Name
         id: imagename
-        run: echo "::set-output name=name::docker.pkg.github.com/${GITHUB_REPOSITORY,,}/base:latest"
+        run: echo "::set-output name=name::ghcr.io/${GITHUB_REPOSITORY,,}/base:latest"
       - name: Pull latest
         run: docker pull ${{ steps.imagename.outputs.name }} || true
       - name: Build base image
@@ -55,12 +55,12 @@ jobs:
       - name: Login to Docker
         uses: docker/login-action@v1
         with:
-          registry: docker.pkg.github.com
+          registry: ghcr.io
           username: ${{ github.actor }}
           password: ${{ github.token }}
       - name: Image Name
         id: imagename
-        run: echo "::set-output name=name::docker.pkg.github.com/${GITHUB_REPOSITORY,,}/base-${{ matrix.target }}:latest"
+        run: echo "::set-output name=name::ghcr.io/${GITHUB_REPOSITORY,,}/base-${{ matrix.target }}:latest"
       - name: Pull latest
         run: docker pull ${{ steps.imagename.outputs.name }} || true
       - name: Build target base image
@@ -84,13 +84,13 @@ jobs:
       - name: Login to Docker
         uses: docker/login-action@v1
         with:
-          registry: docker.pkg.github.com
+          registry: ghcr.io
           username: ${{ github.actor }}
           password: ${{ github.token }}
       - name: Image Name
         id: imagename
         run: |
-          IMG="docker.pkg.github.com/${GITHUB_REPOSITORY,,}/${{ matrix.target }}-${{ matrix.variant }}:latest"
+          IMG="ghcr.io/${GITHUB_REPOSITORY,,}/${{ matrix.target }}-${{ matrix.variant }}:latest"
           echo "::set-output name=name::${IMG/ /-}"
       - name: Pull latest
         run: docker pull ${{ steps.imagename.outputs.name }} || true
@@ -113,7 +113,7 @@ jobs:
       - name: Login to Docker
         uses: docker/login-action@v1
         with:
-          registry: docker.pkg.github.com
+          registry: ghcr.io
           username: ${{ github.actor }}
           password: ${{ github.token }}
       - name: Build ffmpeg
diff --git a/generate.sh b/generate.sh
index 716e7c9..fbfe5ed 100755
--- a/generate.sh
+++ b/generate.sh
@@ -10,7 +10,7 @@ to_df() {
     echo >> Dockerfile
 }
 
-to_df "FROM docker.pkg.github.com/${REPO}/base-${TARGET}:latest"
+to_df "FROM ${REGISTRY}/${REPO}/base-${TARGET}:latest"
 to_df "ENV TARGET=$TARGET VARIANT=$VARIANT REPO=$REPO ADDINS_STR=$ADDINS_STR"
 
 for script in scripts.d/*.sh; do
diff --git a/images/base-win32/Dockerfile b/images/base-win32/Dockerfile
index 6b3c39b..cff8f9c 100644
--- a/images/base-win32/Dockerfile
+++ b/images/base-win32/Dockerfile
@@ -1,5 +1,5 @@
 ARG GH_REPO=btbn/ffmpeg-builds
-FROM docker.pkg.github.com/$GH_REPO/base:latest
+FROM ghcr.io/$GH_REPO/base:latest
 
 ENV DEBIAN_FRONTEND noninteractive
 
diff --git a/images/base-win64/Dockerfile b/images/base-win64/Dockerfile
index eb49e02..df6f12c 100644
--- a/images/base-win64/Dockerfile
+++ b/images/base-win64/Dockerfile
@@ -1,5 +1,5 @@
 ARG GH_REPO=btbn/ffmpeg-builds
-FROM docker.pkg.github.com/$GH_REPO/base:latest
+FROM ghcr.io/$GH_REPO/base:latest
 
 ENV DEBIAN_FRONTEND noninteractive
 
diff --git a/util/vars.sh b/util/vars.sh
index 72ea500..1be3bb1 100644
--- a/util/vars.sh
+++ b/util/vars.sh
@@ -30,7 +30,7 @@ done
 
 REPO="${GITHUB_REPOSITORY:-btbn/ffmpeg-builds}"
 REPO="${REPO,,}"
-REGISTRY="docker.pkg.github.com"
+REGISTRY="ghcr.io"
 BASE_IMAGE="${REGISTRY}/${REPO}/base:latest"
 TARGET_IMAGE="${REGISTRY}/${REPO}/base-${TARGET}:latest"
 IMAGE="${REGISTRY}/${REPO}/${TARGET}-${VARIANT}${ADDINS_STR:+-}${ADDINS_STR}:latest"