diff --git a/blueprint/deployment-configuration/codefresh-template.yaml b/blueprint/deployment-configuration/codefresh-template.yaml
index 7b27418c..c2cc568a 100644
--- a/blueprint/deployment-configuration/codefresh-template.yaml
+++ b/blueprint/deployment-configuration/codefresh-template.yaml
@@ -11,13 +11,17 @@ steps:
     repo: '${{CF_REPO_OWNER}}/${{CF_REPO_NAME}}'
     revision: '${{CF_BRANCH}}'
     git: github
-  secondary_clone:
-    title: Cloning cloud-harness repository...
-    type: git-clone
-    stage: prepare
-    repo: 'https://github.com/MetaCell/cloud-harness.git'
-    revision: '${{CLOUDHARNESS_BRANCH}}'
-    git: github
+  post_main_clone:
+    title: Post main clone
+    type: parallel
+    stage: build
+    steps:
+      - title: Cloning cloud-harness repository...
+        type: git-clone
+        stage: prepare
+        repo: 'https://github.com/MetaCell/cloud-harness.git'
+        revision: '${{CLOUDHARNESS_BRANCH}}'
+        git: github
   build_base_images:
     title: Build base images
     type: parallel
diff --git a/utilities/cloudharness_utilities/codefresh.py b/utilities/cloudharness_utilities/codefresh.py
index fcc33325..5fa7769d 100644
--- a/utilities/cloudharness_utilities/codefresh.py
+++ b/utilities/cloudharness_utilities/codefresh.py
@@ -52,7 +52,7 @@ def codefresh_build_step_from_base_path(base_path, build_step, root_context=None
         codefresh_build_step_from_base_path(os.path.join(CLOUD_HARNESS_PATH, APPS_PATH), BUILD_STEP_PARALLEL)
 
     codefresh['steps'] = {k: step for k, step in codefresh['steps'].items() if
-                          'type' not in step or step['type'] != 'parallel' or step['steps']}
+                          'type' not in step or step['type'] != 'parallel' or (step['steps'] if 'steps' in step else [])}
 
     codefresh_abs_path = os.path.join(deployment_root_path, DEPLOYMENT_PATH, codefresh_path)
     codefresh_dir = os.path.dirname(codefresh_abs_path)
diff --git a/utilities/cloudharness_utilities/deployment-configuration/codefresh-template.yaml b/utilities/cloudharness_utilities/deployment-configuration/codefresh-template.yaml
index c0121484..c95419b5 100644
--- a/utilities/cloudharness_utilities/deployment-configuration/codefresh-template.yaml
+++ b/utilities/cloudharness_utilities/deployment-configuration/codefresh-template.yaml
@@ -11,6 +11,10 @@ steps:
     repo: '${{CF_REPO_OWNER}}/${{CF_REPO_NAME}}'
     revision: '${{CF_BRANCH}}'
     git: github
+  post_main_clone:
+    title: Post main clone
+    type: parallel
+    stage: prepare
   build_base_images:
     title: Build base images
     type: parallel