diff --git a/services/maintenance/image.yaml b/services/maintenance/image.yaml
index 01b652f3..09a322dc 100644
--- a/services/maintenance/image.yaml
+++ b/services/maintenance/image.yaml
@@ -36,11 +36,29 @@ spec:
 apiVersion: image.toolkit.fluxcd.io/v1beta2
 kind: ImagePolicy
 metadata:
-  name: metis
+  name: metis-amd64
   namespace: maintenance
 spec:
   imageRepositoryRef:
     name: metis
+  filterTags:
+    pattern: '^(?P<version>0\.1\.0-\d+)-amd64$'
+    extract: '$version'
+  policy:
+    semver:
+      range: ">=0.1.0-0"
+---
+apiVersion: image.toolkit.fluxcd.io/v1beta2
+kind: ImagePolicy
+metadata:
+  name: metis-arm64
+  namespace: maintenance
+spec:
+  imageRepositoryRef:
+    name: metis
+  filterTags:
+    pattern: '^(?P<version>0\.1\.0-\d+)-arm64$'
+    extract: '$version'
   policy:
     semver:
       range: ">=0.1.0-0"
@@ -59,11 +77,29 @@ spec:
 apiVersion: image.toolkit.fluxcd.io/v1beta2
 kind: ImagePolicy
 metadata:
-  name: metis-sentinel
+  name: metis-sentinel-amd64
   namespace: maintenance
 spec:
   imageRepositoryRef:
     name: metis-sentinel
+  filterTags:
+    pattern: '^(?P<version>0\.1\.0-\d+)-amd64$'
+    extract: '$version'
+  policy:
+    semver:
+      range: ">=0.1.0-0"
+---
+apiVersion: image.toolkit.fluxcd.io/v1beta2
+kind: ImagePolicy
+metadata:
+  name: metis-sentinel-arm64
+  namespace: maintenance
+spec:
+  imageRepositoryRef:
+    name: metis-sentinel
+  filterTags:
+    pattern: '^(?P<version>0\.1\.0-\d+)-arm64$'
+    extract: '$version'
   policy:
     semver:
       range: ">=0.1.0-0"
diff --git a/services/maintenance/kustomization.yaml b/services/maintenance/kustomization.yaml
index 95c7ca7c..affe7c42 100644
--- a/services/maintenance/kustomization.yaml
+++ b/services/maintenance/kustomization.yaml
@@ -50,7 +50,7 @@ images:
   - name: registry.bstein.dev/bstein/ariadne
     newTag: 0.1.0-188 # {"$imagepolicy": "maintenance:ariadne:tag"}
   - name: registry.bstein.dev/bstein/metis
-    newTag: 0.1.0-93-amd64
+    newTag: 0.1.0-93-amd64 # {"$imagepolicy": "maintenance:metis-amd64:tag"}
   - name: registry.bstein.dev/bstein/soteria
     newTag: 0.1.0-36 # {"$imagepolicy": "maintenance:soteria:tag"}
 configMapGenerator:
diff --git a/services/maintenance/metis-configmap.yaml b/services/maintenance/metis-configmap.yaml
index ab591e14..5cd75608 100644
--- a/services/maintenance/metis-configmap.yaml
+++ b/services/maintenance/metis-configmap.yaml
@@ -15,8 +15,8 @@ data:
   METIS_MAX_DEVICE_BYTES: "1000000000000"
   METIS_NAMESPACE: maintenance
   METIS_REMOTE_POD_TIMEOUT_SEC: "7200"
-  METIS_RUNNER_IMAGE_AMD64: registry.bstein.dev/bstein/metis:0.1.0-93-amd64
-  METIS_RUNNER_IMAGE_ARM64: registry.bstein.dev/bstein/metis:0.1.0-93-arm64
+  METIS_RUNNER_IMAGE_AMD64: registry.bstein.dev/bstein/metis:0.1.0-93-amd64 # {"$imagepolicy": "maintenance:metis-amd64:tag"}
+  METIS_RUNNER_IMAGE_ARM64: registry.bstein.dev/bstein/metis:0.1.0-93-arm64 # {"$imagepolicy": "maintenance:metis-arm64:tag"}
   METIS_HARBOR_REGISTRY: registry.bstein.dev
   METIS_HARBOR_PROJECT: metis
   METIS_HARBOR_API_BASE: https://registry.bstein.dev/api/v2.0
diff --git a/services/maintenance/metis-sentinel-amd64-daemonset.yaml b/services/maintenance/metis-sentinel-amd64-daemonset.yaml
index 16aa2c84..f66593b4 100644
--- a/services/maintenance/metis-sentinel-amd64-daemonset.yaml
+++ b/services/maintenance/metis-sentinel-amd64-daemonset.yaml
@@ -31,7 +31,7 @@ spec:
         kubernetes.io/arch: amd64
       containers:
         - name: metis-sentinel
-          image: registry.bstein.dev/bstein/metis-sentinel:0.1.0-91-amd64
+          image: registry.bstein.dev/bstein/metis-sentinel:0.1.0-91-amd64 # {"$imagepolicy": "maintenance:metis-sentinel-amd64:tag"}
           imagePullPolicy: Always
           envFrom:
             - configMapRef:
diff --git a/services/maintenance/metis-sentinel-arm64-daemonset.yaml b/services/maintenance/metis-sentinel-arm64-daemonset.yaml
index e71023b3..b937ffc4 100644
--- a/services/maintenance/metis-sentinel-arm64-daemonset.yaml
+++ b/services/maintenance/metis-sentinel-arm64-daemonset.yaml
@@ -31,7 +31,7 @@ spec:
         kubernetes.io/arch: arm64
       containers:
         - name: metis-sentinel
-          image: registry.bstein.dev/bstein/metis-sentinel:0.1.0-91-arm64
+          image: registry.bstein.dev/bstein/metis-sentinel:0.1.0-91-arm64 # {"$imagepolicy": "maintenance:metis-sentinel-arm64:tag"}
           imagePullPolicy: Always
           envFrom:
             - configMapRef: