diff --git a/.github/workflows/container.yml b/.github/workflows/container.yml
index d8ef0f6..4711e9c 100644
--- a/.github/workflows/container.yml
+++ b/.github/workflows/container.yml
@@ -3,7 +3,7 @@ name: CI Containers
 on:
   push:
     paths:
-      - '.github/ci_images/**'
+      - 'ci_images/**'
   release:
     types: [published]
 
@@ -24,17 +24,17 @@ jobs:
 
     - name: Build & upload dev container image
       env:
-        IMAGE_NAME: ${IMAGE_PREFIX}${{matrix.variant}}:dev
+        IMAGE_NAME: ${{ env.IMAGE_PREFIX }}${{ matrix.variant }}:dev
       run: |
-        docker build -t ${IMAGE_NAME} - < ${GITHUB_WORKSPACE}/.github/ci_images/${{matrix.variant}}_builder.dockerfile
+        docker build -t ${IMAGE_NAME} - < ${GITHUB_WORKSPACE}/ci_images/${{matrix.variant}}_builder.dockerfile
         echo "${{ secrets.GHCR_TOKEN }}" | docker login -u "${{ secrets.GHCR_USERNAME }}" --password-stdin
         docker push ${IMAGE_NAME}
 
     - name: Build & upload release container image
       if: github.event.action == 'published'
       env:
-        IMAGE_NAME: ${IMAGE_PREFIX}${{matrix.variant}}:${GITHUB_REF_NAME}
+        IMAGE_NAME: ${{ env.IMAGE_PREFIX }}${{ matrix.variant }}:${{ env.GITHUB_REF_NAME }}
       run: |
-        docker build -t ${IMAGE_NAME} - < ${GITHUB_WORKSPACE}/.github/ci_images/${{matrix.variant}}_builder.dockerfile
+        docker build -t ${IMAGE_NAME} - < ${GITHUB_WORKSPACE}/ci_images/${{matrix.variant}}_builder.dockerfile
         echo "${{ secrets.GHCR_TOKEN }}" | docker login -u "${{ secrets.GHCR_USERNAME }}" --password-stdin
         docker push --all-tags ${IMAGE_NAME}
diff --git a/.github/ci_images/alpine_builder.dockerfile b/ci_images/alpine_builder.dockerfile
similarity index 100%
rename from .github/ci_images/alpine_builder.dockerfile
rename to ci_images/alpine_builder.dockerfile
diff --git a/.github/ci_images/bionic_builder.dockerfile b/ci_images/bionic_builder.dockerfile
similarity index 100%
rename from .github/ci_images/bionic_builder.dockerfile
rename to ci_images/bionic_builder.dockerfile
diff --git a/.github/ci_images/f35_builder.dockerfile b/ci_images/f35_builder.dockerfile
similarity index 100%
rename from .github/ci_images/f35_builder.dockerfile
rename to ci_images/f35_builder.dockerfile
diff --git a/.github/ci_images/focal_builder.dockerfile b/ci_images/focal_builder.dockerfile
similarity index 100%
rename from .github/ci_images/focal_builder.dockerfile
rename to ci_images/focal_builder.dockerfile