diff --git a/charts/cf-runtime/tests/runtime/runtime_test.yaml b/charts/cf-runtime/tests/runtime/runtime_test.yaml
index e210da06..0aa9458b 100644
--- a/charts/cf-runtime/tests/runtime/runtime_test.yaml
+++ b/charts/cf-runtime/tests/runtime/runtime_test.yaml
@@ -70,8 +70,8 @@ tests:
                 KUBE_DEPLOY: 'quay.io/codefresh/cf-deploy-kubernetes:tagoverride'
                 PIPELINE_DEBUGGER_IMAGE: 'quay.io/codefresh/cf-debugger:tagoverride'
                 TEMPLATE_ENGINE: 'quay.io/codefresh/pikolo:tagoverride'
-                CR_6177_FIXER: 'quay.io/codefresh/alpine:edge'
-                GC_BUILDER_IMAGE: 'quay.io/codefresh/cf-gc-builder:0.5.3'
+                CR_6177_FIXER: 'alpine:tagoverride'
+                GC_BUILDER_IMAGE: 'quay.io/codefresh/cf-gc-builder:tagoverride'
                 COSIGN_IMAGE_SIGNER_IMAGE: 'quay.io/codefresh/cf-cosign-image-signer:tagoverride'
               userEnvVars:
                 - name: ALICE
diff --git a/charts/cf-runtime/tests/runtime/runtime_values.yaml b/charts/cf-runtime/tests/runtime/runtime_values.yaml
index 3b73f4f5..7622df74 100644
--- a/charts/cf-runtime/tests/runtime/runtime_values.yaml
+++ b/charts/cf-runtime/tests/runtime/runtime_values.yaml
@@ -3,6 +3,7 @@ runtime:
     image:
       tag: tagoverride
       pullPolicy: Always
+      digest: ""
     resources:
       requests: null
       limits:
@@ -55,6 +56,7 @@ runtime:
     image:
       tag: tagoverride
       pullPolicy: Always
+      digest: ""
     command:
       - one
       - two
@@ -78,6 +80,8 @@ runtime:
       KUBE_DEPLOY: quay.io/codefresh/cf-deploy-kubernetes:tagoverride
       PIPELINE_DEBUGGER_IMAGE: quay.io/codefresh/cf-debugger:tagoverride
       TEMPLATE_ENGINE: quay.io/codefresh/pikolo:tagoverride
+      CR_6177_FIXER: alpine:tagoverride
+      GC_BUILDER_IMAGE: quay.io/codefresh/cf-gc-builder:tagoverride    
       COSIGN_IMAGE_SIGNER_IMAGE: quay.io/codefresh/cf-cosign-image-signer:tagoverride
     env:
       FOO: BAR