diff --git a/platforms/shared/configuration/roles/create/job_component/tasks/main.yaml b/platforms/shared/configuration/roles/create/job_component/tasks/main.yaml
index 3be1a403b78..749d46f4e2f 100644
--- a/platforms/shared/configuration/roles/create/job_component/tasks/main.yaml
+++ b/platforms/shared/configuration/roles/create/job_component/tasks/main.yaml
@@ -45,7 +45,6 @@
       - "{{ values_dir }}/{{ component_name }}.yaml"
     force: true
     wait: true
-    update_repo_cache: true
     kubeconfig: "{{ kubernetes.config_file }}"
   when:
     - helm_check.status is not defined
diff --git a/platforms/shared/configuration/roles/create/job_component/templates/create_channel_job.tpl b/platforms/shared/configuration/roles/create/job_component/templates/create_channel_job.tpl
index 985d5e199ed..4f4c9a858e6 100644
--- a/platforms/shared/configuration/roles/create/job_component/templates/create_channel_job.tpl
+++ b/platforms/shared/configuration/roles/create/job_component/templates/create_channel_job.tpl
@@ -18,8 +18,8 @@ global:
     externalUrlSuffix: {{ org.external_url_suffix }}
 
 image:
-  fabricTools: {{ docker_url }}/{{ fabric_tools_image }}
-  alpineUtils: {{ docker_url }}/bevel-alpine:{{ bevel_alpine_version }}
+  fabricTools: {{ docker_url }}/{{ charts.fabric_tools_image }}
+  alpineUtils: {{ docker_url }}/bevel-alpine:{{ charts.bevel_alpine_version }}
 {% if network.docker.username is defined and network.docker.password is defined  %}
   pullSecret: regcred
 {% else %}
diff --git a/platforms/shared/configuration/roles/create/job_component/templates/fabric_genesis.tpl b/platforms/shared/configuration/roles/create/job_component/templates/fabric_genesis.tpl
index 11bb07f32fd..3b58dfcb350 100755
--- a/platforms/shared/configuration/roles/create/job_component/templates/fabric_genesis.tpl
+++ b/platforms/shared/configuration/roles/create/job_component/templates/fabric_genesis.tpl
@@ -18,8 +18,8 @@ global:
     externalUrlSuffix: {{ org.external_url_suffix }}
 
 image:
-  alpineUtils: {{ docker_url }}/bevel-alpine:{{ bevel_alpine_version }}
-  fabricTools: {{ docker_url }}/{{ fabric_tools_image }}
+  alpineUtils: {{ docker_url }}/bevel-alpine:{{ charts.bevel_alpine_version }}
+  fabricTools: {{ docker_url }}/{{ charts.fabric_tools_image }}
 {% if network.docker.username is defined and network.docker.password is defined  %}
   pullSecret: regcred
 {% else %}
diff --git a/platforms/shared/configuration/roles/create/job_component/templates/join_channel_job.tpl b/platforms/shared/configuration/roles/create/job_component/templates/join_channel_job.tpl
index a46174e22d0..ef097b2e82e 100644
--- a/platforms/shared/configuration/roles/create/job_component/templates/join_channel_job.tpl
+++ b/platforms/shared/configuration/roles/create/job_component/templates/join_channel_job.tpl
@@ -18,8 +18,8 @@ global:
     externalUrlSuffix: {{ org.external_url_suffix }}
 
 image:
-  fabricTools: {{ docker_url }}/{{ fabric_tools_image }}
-  alpineUtils: {{ docker_url }}/bevel-alpine:{{ bevel_alpine_version }}
+  fabricTools: {{ docker_url }}/{{ charts.fabric_tools_image }}
+  alpineUtils: {{ docker_url }}/bevel-alpine:{{ charts.bevel_alpine_version }}
 {% if network.docker.username is defined and network.docker.password is defined  %}
   pullSecret: regcred
 {% else %}
diff --git a/platforms/shared/configuration/roles/create/job_component/templates/osn_create_channel_job.tpl b/platforms/shared/configuration/roles/create/job_component/templates/osn_create_channel_job.tpl
index 0a43e0fdecc..b55a83805b8 100644
--- a/platforms/shared/configuration/roles/create/job_component/templates/osn_create_channel_job.tpl
+++ b/platforms/shared/configuration/roles/create/job_component/templates/osn_create_channel_job.tpl
@@ -18,8 +18,8 @@ global:
     externalUrlSuffix: {{ org.external_url_suffix }}
 
 image:
-  fabricTools: {{ docker_url }}/{{ fabric_tools_image }}
-  alpineUtils: {{ docker_url }}/bevel-alpine:{{ bevel_alpine_version }}
+  fabricTools: {{ docker_url }}/{{ charts.fabric_tools_image }}
+  alpineUtils: {{ docker_url }}/bevel-alpine:{{ charts.bevel_alpine_version }}
 {% if network.docker.username is defined and network.docker.password is defined  %}
   pullSecret: regcred
 {% else %}