diff --git a/release-manifest-image/_service b/release-manifest-image/_service
index d9e13b3..aea1019 100644
--- a/release-manifest-image/_service
+++ b/release-manifest-image/_service
@@ -6,11 +6,15 @@
     <param name="var">IMG_PREFIX</param>
     <param name="eval">IMG_REPO=$(rpm --macros=/root/.rpmmacros -E %img_repo)</param>
     <param name="var">IMG_REPO</param>
-    <param name="file">release_manifest.yaml</param>
-    <param name="eval">CHART_REPO=$(rpm --macros=/root/.rpmmacros -E %chart_repo)</param>
-    <param name="var">CHART_REPO</param>
     <param name="eval">SUPPORT_LEVEL=$(rpm --macros=/root/.rpmmacros -E %support_level)</param>
     <param name="var">SUPPORT_LEVEL</param>
+  </service>
+  <service name="replace_using_env" mode="buildtime">
+    <param name="file">release_manifest.yaml</param>
+    <param name="eval">IMG_PREFIX=$(rpm --macros=/root/.rpmmacros -E %{?img_prefix})</param>
+    <param name="var">IMG_PREFIX</param>
+    <param name="eval">CHART_REPO=$(rpm --macros=/root/.rpmmacros -E %chart_repo)</param>
+    <param name="var">CHART_REPO</param>
     <param name="eval">CHART_MAJOR=$(rpm --macros=/root/.rpmmacros -E %{?chart_major})</param>
     <param name="var">CHART_MAJOR</param>
   </service>
diff --git a/release-manifest-image/release_manifest.yaml b/release-manifest-image/release_manifest.yaml
index 7775a98..1cae759 100644
--- a/release-manifest-image/release_manifest.yaml
+++ b/release-manifest-image/release_manifest.yaml
@@ -37,19 +37,19 @@ spec:
               repository: https://charts.rancher.io
         - prettyName: MetalLB
           releaseName: metallb
-          chart: %%CHART_REPO%%/%%IMAGE_PREFIX%%metallb-chart
+          chart: %%CHART_REPO%%/%%IMG_PREFIX%%metallb-chart
           version: %%CHART_MAJOR%%.0.0+up0.14.9
         - prettyName: CDI
           releaseName: cdi
-          chart: %%CHART_REPO%%/%%IMAGE_PREFIX%%cdi-chart
+          chart: %%CHART_REPO%%/%%IMG_PREFIX%%cdi-chart
           version: %%CHART_MAJOR%%.0.0+up0.4.0
         - prettyName: KubeVirt
           releaseName: kubevirt
-          chart: %%CHART_REPO%%/%%IMAGE_PREFIX%%kubevirt-chart
+          chart: %%CHART_REPO%%/%%IMG_PREFIX%%kubevirt-chart
           version: %%CHART_MAJOR%%.0.0+up0.4.0
           addonCharts:
             - releaseName: kubevirt-dashboard-extension
-              chart: %%CHART_REPO%%/%%IMAGE_PREFIX%%kubevirt-dashboard-extension-chart
+              chart: %%CHART_REPO%%/%%IMG_PREFIX%%kubevirt-dashboard-extension-chart
               version: %%CHART_MAJOR%%.0.0+up1.2.0
         - prettyName: NeuVector
           releaseName: neuvector
@@ -68,7 +68,7 @@ spec:
               version: 2.0.0
         - prettyName: EndpointCopierOperator
           releaseName: endpoint-copier-operator
-          chart: %%CHART_REPO%%/%%IMAGE_PREFIX%%endpoint-copier-operator-chart
+          chart: %%CHART_REPO%%/%%IMG_PREFIX%%endpoint-copier-operator-chart
           version: %%CHART_MAJOR%%.0.0+up0.2.1
         - prettyName: Elemental
           releaseName: elemental-operator
@@ -80,25 +80,25 @@ spec:
               version: 1.6.5
         - prettyName: SRIOV
           releaseName: sriov-network-operator
-          chart: %%CHART_REPO%%/%%IMAGE_PREFIX%%sriov-network-operator-chart
+          chart: %%CHART_REPO%%/%%IMG_PREFIX%%sriov-network-operator-chart
           version: %%CHART_MAJOR%%.0.0+up1.4.0
           dependencyCharts:
             - releaseName: sriov-crd
-              chart: %%CHART_REPO%%/%%IMAGE_PREFIX%%sriov-crd-chart
+              chart: %%CHART_REPO%%/%%IMG_PREFIX%%sriov-crd-chart
               version: %%CHART_MAJOR%%.0.0+up1.4.0
         - prettyName: Akri
           releaseName: akri
-          chart: %%CHART_REPO%%/%%IMAGE_PREFIX%%akri-chart
+          chart: %%CHART_REPO%%/%%IMG_PREFIX%%akri-chart
           version: %%CHART_MAJOR%%.0.0+up0.12.20
           addonCharts:
             - releaseName: akri-dashboard-extension
-              chart: %%CHART_REPO%%/%%IMAGE_PREFIX%%akri-dashboard-extension-chart
+              chart: %%CHART_REPO%%/%%IMG_PREFIX%%akri-dashboard-extension-chart
               version: %%CHART_MAJOR%%.0.0+up1.1.0
         - prettyName: Metal3
           releaseName: metal3
-          chart: %%CHART_REPO%%/%%IMAGE_PREFIX%%metal3-chart
+          chart: %%CHART_REPO%%/%%IMG_PREFIX%%metal3-chart
           version: %%CHART_MAJOR%%.0.0+up0.9.0
         - prettyName: RancherTurtles
           releaseName: rancher-turtles
-          chart: %%CHART_REPO%%/%%IMAGE_PREFIX%%rancher-turtles-chart
+          chart: %%CHART_REPO%%/%%IMG_PREFIX%%rancher-turtles-chart
           version: %%CHART_MAJOR%%.0.0+up0.4.0