diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 0460360..ff5de7c 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -20,7 +20,7 @@ jobs:
           cache_froms: btbn/ffmpeg-builder:base
           repository: btbn/ffmpeg-builder
           tags: base
-          path: base
+          path: images/base
   build_target_bases:
     name: Build target base image
     needs: build_base
@@ -42,7 +42,7 @@ jobs:
           cache_froms: btbn/ffmpeg-builder:base-${{ matrix.target }}
           repository: btbn/ffmpeg-builder
           tags: base-${{ matrix.target }}
-          path: base-${{ matrix.target }}
+          path: images/base-${{ matrix.target }}
   build_targets:
     name: Build target-variant image
     needs: build_target_bases
@@ -67,3 +67,11 @@ jobs:
           cache_froms: btbn/ffmpeg-builder:${{ matrix.target }}-${{ matrix.variant }}
           repository: btbn/ffmpeg-builder
           tags: ${{ matrix.target }}-${{ matrix.variant }}
+  build_ffmpeg:
+    name: Build ffmpeg
+    needs: build_targets
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        target: [win64]
+        variant: [gpl,lgpl]
diff --git a/base-win64/Dockerfile b/images/base-win64/Dockerfile
similarity index 100%
rename from base-win64/Dockerfile
rename to images/base-win64/Dockerfile
diff --git a/base/Dockerfile b/images/base/Dockerfile
similarity index 100%
rename from base/Dockerfile
rename to images/base/Dockerfile