diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 62ed423..544f06f 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -15,12 +15,9 @@ jobs:
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
           registry: docker.pkg.github.com
-          build_args: BUILDKIT_INLINE_CACHE=1
-          repository: btbn/ffmpeg-build/base
-          cache_froms: btbn/ffmpeg-build/base:latest
-          tags: latest
+          repository: btbn/ffmpeg-build/builder
+          tags: base
           path: base
-          always_pull: true
   build_target_bases:
     name: Build target base images
     needs: build_base
@@ -37,12 +34,9 @@ jobs:
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
           registry: docker.pkg.github.com
-          build_args: BUILDKIT_INLINE_CACHE=1
-          repository: btbn/ffmpeg-build/base-${{ matrix.target }}
-          cache_froms: btbn/ffmpeg-build/base-${{ matrix.target }}:latest
-          tags: latest
+          repository: btbn/ffmpeg-build/builder
+          tags: base-${{ matrix.target }}
           path: base-${{ matrix.target }}
-          always_pull: true
   build_targets:
     name: Build target images
     needs: build_target_bases
@@ -62,8 +56,5 @@ jobs:
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
           registry: docker.pkg.github.com
-          build_args: BUILDKIT_INLINE_CACHE=1
-          repository: btbn/ffmpeg-build/${{ matrix.target }}-${{ matrix.variant }}
-          cache_froms: btbn/ffmpeg-build/${{ matrix.target }}-${{ matrix.variant }}:latest
-          tags: latest
-          always_pull: true
+          repository: btbn/ffmpeg-build/builder
+          tags: ${{ matrix.target }}-${{ matrix.variant }}
diff --git a/base-win64/Dockerfile b/base-win64/Dockerfile
index d235eff..a40c07d 100644
--- a/base-win64/Dockerfile
+++ b/base-win64/Dockerfile
@@ -1,4 +1,4 @@
-FROM btbn/ffmpeg-builds/base:latest
+FROM docker.pkg.github.com/btbn/ffmpeg-builds/builder:base
 
 ENV DEBIAN_FRONTEND noninteractive
 
diff --git a/generate.sh b/generate.sh
index 9ab8741..40eb949 100755
--- a/generate.sh
+++ b/generate.sh
@@ -10,7 +10,7 @@ to_df() {
     echo >> Dockerfile
 }
 
-to_df "FROM $REPO/base-$TARGET:latest"
+to_df "FROM $REPO/builder:base-$TARGET"
 to_df "ENV TARGET $TARGET"
 to_df "ENV VARIANT $VARIANT"
 to_df "ENV REPO $REPO"
diff --git a/util/vars.sh b/util/vars.sh
index f3c66a6..3e0db81 100644
--- a/util/vars.sh
+++ b/util/vars.sh
@@ -7,7 +7,7 @@ fi
 
 TARGET="$1"
 VARIANT="${2:-gpl}"
-REPO="${GITHUB_REPOSITORY:-btbn/ffmpeg-builds}"
+REPO="docker.pkg.github.com/${GITHUB_REPOSITORY:-btbn/ffmpeg-builds}"
 REPO="${REPO,,}"
 
 IMAGE="$REPO/$TARGET-$VARIANT:latest"