diff --git a/charts/t8s-cluster/templates/management-cluster/cluster.yaml b/charts/t8s-cluster/templates/management-cluster/cluster.yaml
index 6d2efb85fd..a27607f700 100644
--- a/charts/t8s-cluster/templates/management-cluster/cluster.yaml
+++ b/charts/t8s-cluster/templates/management-cluster/cluster.yaml
@@ -38,3 +38,6 @@ spec:
   {{- end }}
   bastion:
     enabled: false
+  {{- with .Values.openstackImageNamePrefix }}
+  openStackImageNamePrefix: {{ . | quote }}
+  {{- end }}
diff --git a/charts/t8s-cluster/templates/management-cluster/clusterClass/clusterClass.yaml b/charts/t8s-cluster/templates/management-cluster/clusterClass/clusterClass.yaml
index cac1c8cfd9..2cf4fd8e37 100644
--- a/charts/t8s-cluster/templates/management-cluster/clusterClass/clusterClass.yaml
+++ b/charts/t8s-cluster/templates/management-cluster/clusterClass/clusterClass.yaml
@@ -120,7 +120,7 @@ spec:
               op: add
               path: /spec/template/spec/image
               valueFrom:
-                template: {{ printf "t8s-engine-%s-{{ .builtin.machineDeployment.version }}" .Values.openstackImageNamePrefix }}
+                template: {{ printf "t8s-engine-%s{{ .builtin.machineDeployment.version }}" .Values.openstackImageNamePrefix }}
           selector: &imagePatchSelector
             apiVersion: {{ include "t8s-cluster.clusterClass.infrastructureApiVersion" (dict) }}
             kind: OpenStackMachineTemplate
@@ -130,7 +130,7 @@ spec:
         - jsonPatches:
             - <<: *imagePatch
               valueFrom:
-                template: {{ printf "t8s-engine-%s-{{ .builtin.controlPlane.version }}" .Values.openstackImageNamePrefix }}
+                template: {{ printf "t8s-engine-%s{{ .builtin.controlPlane.version }}" .Values.openstackImageNamePrefix }}
           selector:
             <<: *imagePatchSelector
             matchResources:
diff --git a/charts/t8s-cluster/values.yaml b/charts/t8s-cluster/values.yaml
index ba7e06a78c..0b17e2af44 100644
--- a/charts/t8s-cluster/values.yaml
+++ b/charts/t8s-cluster/values.yaml
@@ -69,4 +69,4 @@ sshKeyName: null
 
 cni: cilium
 
-openstackImageNamePrefix: 2004-kube
+openstackImageNamePrefix: 2004-kube-