diff --git a/.github/workflows/flux-cli-image.yaml b/.github/workflows/flux-cli-image.yaml
index a001ded..de36ccb 100644
--- a/.github/workflows/flux-cli-image.yaml
+++ b/.github/workflows/flux-cli-image.yaml
@@ -21,7 +21,7 @@ jobs:
           registry: artifact.onwalk.net
           username: admin
           password: ${{ secrets.HELM_REPO_PASSWORD }}
-          build_file: fluxcd/flux-cli.Dockerfile
+          build_file: oci/fluxcd/flux-cli.Dockerfile
           image: public/fluxcd/flux-cli
           tag: v0.31.3
           cache: true
diff --git a/.github/workflows/flux-helm-controller-image.yaml b/.github/workflows/flux-helm-controller-image.yaml
index 713ff13..8cf48c9 100644
--- a/.github/workflows/flux-helm-controller-image.yaml
+++ b/.github/workflows/flux-helm-controller-image.yaml
@@ -21,7 +21,7 @@ jobs:
           registry: artifact.onwalk.net
           username: admin
           password: ${{ secrets.HELM_REPO_PASSWORD }}
-          build_file: fluxcd/flux-helm-controller.Dockerfile
+          build_file: oci/fluxcd/flux-helm-controller.Dockerfile
           image: public/fluxcd/helm-controller
           tag: v0.22.1
           cache: true
diff --git a/.github/workflows/flux-image-automation-controller.yaml b/.github/workflows/flux-image-automation-controller.yaml
index e62cf1b..8f1256a 100644
--- a/.github/workflows/flux-image-automation-controller.yaml
+++ b/.github/workflows/flux-image-automation-controller.yaml
@@ -21,7 +21,7 @@ jobs:
           registry: artifact.onwalk.net
           username: admin
           password: ${{ secrets.HELM_REPO_PASSWORD }}
-          build_file: fluxcd/flux-image-automation-controller.Dockerfile
+          build_file: oci/fluxcd/flux-image-automation-controller.Dockerfile
           image: public/fluxcd/image-automation-controller
           tag: v0.23.4
           cache: true
diff --git a/.github/workflows/flux-image-reflector-controller.yaml b/.github/workflows/flux-image-reflector-controller.yaml
index e1784e9..ffd9352 100644
--- a/.github/workflows/flux-image-reflector-controller.yaml
+++ b/.github/workflows/flux-image-reflector-controller.yaml
@@ -21,7 +21,7 @@ jobs:
           registry: artifact.onwalk.net
           username: admin
           password: ${{ secrets.HELM_REPO_PASSWORD }}
-          build_file: fluxcd/flux-image-reflector-controller.Dockerfile
+          build_file: oci/fluxcd/flux-image-reflector-controller.Dockerfile
           image: public/fluxcd/image-reflector-controller
           tag: v0.19.2
           cache: true
diff --git a/.github/workflows/flux-kustomize-controller-image.yaml b/.github/workflows/flux-kustomize-controller-image.yaml
index e51362e..3525784 100644
--- a/.github/workflows/flux-kustomize-controller-image.yaml
+++ b/.github/workflows/flux-kustomize-controller-image.yaml
@@ -21,7 +21,7 @@ jobs:
           registry: artifact.onwalk.net
           username: admin
           password: ${{ secrets.HELM_REPO_PASSWORD }}
-          build_file: fluxcd/flux-kustomize-controller.Dockerfile
+          build_file: oci/fluxcd/flux-kustomize-controller.Dockerfile
           image: public/fluxcd/kustomize-controller
           tag: v0.26.2
           cache: true
diff --git a/.github/workflows/flux-notification-controller-image.yaml b/.github/workflows/flux-notification-controller-image.yaml
index 2244dab..b0210ae 100644
--- a/.github/workflows/flux-notification-controller-image.yaml
+++ b/.github/workflows/flux-notification-controller-image.yaml
@@ -21,8 +21,8 @@ jobs:
           registry: artifact.onwalk.net
           username: admin
           password: ${{ secrets.HELM_REPO_PASSWORD }}
-          build_file: fluxcd/flux-notification-controller.Dockerfile
-          image: k8s/fluxcd/notification-controller
+          build_file: oci/fluxcd/flux-notification-controller.Dockerfile
+          image: public/fluxcd/notification-controller
           tag: v0.24.0
           cache: true
           cache_registry: cache
diff --git a/.github/workflows/flux-source-controller-image.yaml b/.github/workflows/flux-source-controller-image.yaml
index b46f820..89e2592 100644
--- a/.github/workflows/flux-source-controller-image.yaml
+++ b/.github/workflows/flux-source-controller-image.yaml
@@ -21,8 +21,8 @@ jobs:
           registry: artifact.onwalk.net
           username: admin
           password: ${{ secrets.HELM_REPO_PASSWORD }}
-          build_file: fluxcd/flux-source-controller.Dockerfile
-          image: k8s/fluxcd/source-controller
+          build_file: oci/fluxcd/flux-source-controller.Dockerfile
+          image: public/fluxcd/source-controller
           tag: v0.25.9
           cache: true
           cache_registry: cache