diff --git a/base-kustomize/octavia/base/kustomization.yaml b/base-kustomize/octavia/base/kustomization.yaml
index b5695079..8f0586ed 100644
--- a/base-kustomize/octavia/base/kustomization.yaml
+++ b/base-kustomize/octavia/base/kustomization.yaml
@@ -1,5 +1,14 @@
 sortOptions:
   order: fifo
+
+images:
+  - name: image-kubernetes-entrypoint-init
+    newName: quay.io/airshipit/kubernetes-entrypoint
+    newTag: v1.0.0
+  - name: image-octavia-ovn
+    newName: quay.io/rackspace/rackerlabs-octavia-ovn
+    newTag: master-ubuntu_jammy
+
 resources:
   - octavia-mariadb-database.yaml
   - octavia-rabbitmq-queue.yaml
@@ -18,7 +27,7 @@ patches:
         path: /spec/template/spec/containers
         value:
         - name: octavia-agent
-          image: "ghcr.io/rackerlabs/genestack/octavia-ovn:master-ubuntu_jammy"
+          image: image-octavia-ovn
           imagePullPolicy: IfNotPresent
           securityContext:
             runAsUser: 0
@@ -58,7 +67,7 @@ patches:
             - mountPath: /var/run/octavia
               name: pod-run-octavia
         - name: octavia-api
-          image: "ghcr.io/rackerlabs/genestack/octavia-ovn:master-ubuntu_jammy"
+          image: image-octavia-ovn
           imagePullPolicy: IfNotPresent
           securityContext:
             runAsUser: 0
diff --git a/base-kustomize/octavia/base/octavia-agent.yaml b/base-kustomize/octavia/base/octavia-agent.yaml
index ba2bb5fc..1d70a490 100644
--- a/base-kustomize/octavia/base/octavia-agent.yaml
+++ b/base-kustomize/octavia/base/octavia-agent.yaml
@@ -59,7 +59,7 @@ spec:
       initContainers:
 
         - name: init
-          image: "quay.io/airshipit/kubernetes-entrypoint:v1.0.0"
+          image: image-kubernetes-entrypoint-init
           imagePullPolicy: IfNotPresent
           securityContext:
             allowPrivilegeEscalation: false
@@ -98,7 +98,7 @@ spec:
             null
       containers:
         - name: octavia-agent
-          image: "ghcr.io/rackerlabs/genestack/octavia-ovn:master-ubuntu_jammy"
+          image: image-octavia-ovn
           imagePullPolicy: IfNotPresent
           securityContext:
             runAsUser: 0
@@ -137,7 +137,7 @@ spec:
             - mountPath: /var/run/octavia
               name: pod-run-octavia
         - name: octavia-api
-          image: "ghcr.io/rackerlabs/genestack/octavia-ovn:master-ubuntu_jammy"
+          image: image-octavia-ovn
           imagePullPolicy: IfNotPresent
           securityContext:
             runAsUser: 0