diff --git a/installers/30-deploy-mgmt-cluster.sh b/installers/30-deploy-mgmt-cluster.sh
index f99c6f9..f5697b7 100755
--- a/installers/30-deploy-mgmt-cluster.sh
+++ b/installers/30-deploy-mgmt-cluster.sh
@@ -115,6 +115,10 @@
 TEMPLATES_DIR=$(readlink -f "${TEMPLATES_DIR}")
 # rsync -varhP "${TEMPLATES_DIR}" "${SW_CATALOGS_REPO_DIR}/"
 cp -r "${TEMPLATES_DIR}"/* "${SW_CATALOGS_REPO_DIR}/"
+if [ -n "${OSM_DOCKER_TAG}" ]; then
+  # Replace the OSM Docker tag in the WF templates
+  find "${SW_CATALOGS_REPO_DIR}/infra-configs/osm-workflows/templates/wf-templates/building-blocks" -type f -name "*.yaml" -exec sed -i "s|opensourcemano/osm-krm-functions:testing-daily|${DOCKER_REGISTRY_URL}${DOCKER_USER}/osm-krm-functions:${OSM_DOCKER_TAG}|g" {} +
+fi
 
 #####################################################################
 
diff --git a/installers/flux/templates/sw-catalogs/infra-configs/osm-workflows/templates/wf-templates/building-blocks/cluster-management-wft.yaml b/installers/flux/templates/sw-catalogs/infra-configs/osm-workflows/templates/wf-templates/building-blocks/cluster-management-wft.yaml
index 852799b..50b9b0e 100644
--- a/installers/flux/templates/sw-catalogs/infra-configs/osm-workflows/templates/wf-templates/building-blocks/cluster-management-wft.yaml
+++ b/installers/flux/templates/sw-catalogs/infra-configs/osm-workflows/templates/wf-templates/building-blocks/cluster-management-wft.yaml
@@ -446,7 +446,7 @@
         value: "{{inputs.parameters.fleet_repo_dir}}/{{inputs.parameters.project_name}}/managed-resources/_management"
 
     container:
-      image: ttl.sh/osm-krm-functions:24h
+      image: opensourcemano/osm-krm-functions:testing-daily
       # imagePullPolicy: Always
       command: ["/app/scripts/entrypoint.sh"]
       args: