diff --git a/charts/jarvis-system/templates/Task-createProjectAccess.yaml b/charts/jarvis-system/templates/Task-createProjectAccess.yaml
index 52e8795c..f1011e56 100644
--- a/charts/jarvis-system/templates/Task-createProjectAccess.yaml
+++ b/charts/jarvis-system/templates/Task-createProjectAccess.yaml
@@ -31,10 +31,11 @@ spec:
           else
             echo "Namespace already exists, delete all resources for re-run."
             kubectl delete pr -n jarvis-$(params.changeNumber)-$(params.patchSetNumber) --all
-            helm delete development-pipeline -n jarvis-$(params.changeNumber)-$(params.patchSetNumber)
-            kubectl delete role -n jarvis-$(params.changeNumber)-$(params.patchSetNumber)
-            kubectl delete sa -n jarvis-$(params.changeNumber)-$(params.patchSetNumber)
-            kubectl delete rolebinding -n jarvis-$(params.changeNumber)-$(params.patchSetNumber)
+            helm delete development-pipeline -n jarvis-$(params.changeNumber)-$(params.patchSetNumber) || true
+            kubectl delete role -n jarvis-$(params.changeNumber)-$(params.patchSetNumber) --all
+            kubectl delete secret -n jarvis-$(params.changeNumber)-$(params.patchSetNumber) --all
+            kubectl delete sa -n jarvis-$(params.changeNumber)-$(params.patchSetNumber) --all
+            kubectl delete rolebinding -n jarvis-$(params.changeNumber)-$(params.patchSetNumber) --all
           fi
         }
         create_namespace
diff --git a/tools/gate/jarvis/5G-SA-core/ausf/jarvis/development-pipeline/templates/config_map.yaml b/tools/gate/jarvis/5G-SA-core/ausf/jarvis/development-pipeline/templates/config_map.yaml
index 233733ae..33945736 100644
--- a/tools/gate/jarvis/5G-SA-core/ausf/jarvis/development-pipeline/templates/config_map.yaml
+++ b/tools/gate/jarvis/5G-SA-core/ausf/jarvis/development-pipeline/templates/config_map.yaml
@@ -72,7 +72,7 @@ data:
       "chart_registry_url": "harbor-core.jarvis.local/chartrepo",
       "chart_repository": "jarvis-harbor",
       "docker_registry": "harbor-core.jarvis.local",
-      "harbor_secret_mounted_path": "/workspace/helm-creds"
+      "harbor_secret_mounted_path": "/workspace/helm-creds",
       "clone_async_batch_size": 20,
       "chart_async_batch_size": 20,
       "image_async_batch_size": 2
diff --git a/tools/gate/jarvis/5G-SA-core/mongodb/jarvis/development-pipeline/templates/config_map.yaml b/tools/gate/jarvis/5G-SA-core/mongodb/jarvis/development-pipeline/templates/config_map.yaml
index dae7c6bb..b3da5f35 100644
--- a/tools/gate/jarvis/5G-SA-core/mongodb/jarvis/development-pipeline/templates/config_map.yaml
+++ b/tools/gate/jarvis/5G-SA-core/mongodb/jarvis/development-pipeline/templates/config_map.yaml
@@ -68,7 +68,7 @@ data:
       "chart_registry_url": "harbor-core.jarvis.local/chartrepo",
       "chart_repository": "jarvis-harbor",
       "docker_registry": "harbor-core.jarvis.local",
-      "harbor_secret_mounted_path": "/workspace/helm-creds"
+      "harbor_secret_mounted_path": "/workspace/helm-creds",
       "clone_async_batch_size": 20,
       "chart_async_batch_size": 20,
       "image_async_batch_size": 2
diff --git a/tools/gate/jarvis/5G-SA-core/nrf/jarvis/development-pipeline/templates/config_map.yaml b/tools/gate/jarvis/5G-SA-core/nrf/jarvis/development-pipeline/templates/config_map.yaml
index 0718b33f..4a316f91 100644
--- a/tools/gate/jarvis/5G-SA-core/nrf/jarvis/development-pipeline/templates/config_map.yaml
+++ b/tools/gate/jarvis/5G-SA-core/nrf/jarvis/development-pipeline/templates/config_map.yaml
@@ -72,7 +72,7 @@ data:
       "chart_registry_url": "harbor-core.jarvis.local/chartrepo",
       "chart_repository": "jarvis-harbor",
       "docker_registry": "harbor-core.jarvis.local",
-      "harbor_secret_mounted_path": "/workspace/helm-creds"
+      "harbor_secret_mounted_path": "/workspace/helm-creds",
       "clone_async_batch_size": 20,
       "chart_async_batch_size": 20,
       "image_async_batch_size": 2
diff --git a/tools/gate/jarvis/5G-SA-core/pcf/jarvis/development-pipeline/templates/config_map.yaml b/tools/gate/jarvis/5G-SA-core/pcf/jarvis/development-pipeline/templates/config_map.yaml
index 3fab9178..34308aff 100644
--- a/tools/gate/jarvis/5G-SA-core/pcf/jarvis/development-pipeline/templates/config_map.yaml
+++ b/tools/gate/jarvis/5G-SA-core/pcf/jarvis/development-pipeline/templates/config_map.yaml
@@ -72,7 +72,7 @@ data:
       "chart_registry_url": "harbor-core.jarvis.local/chartrepo",
       "chart_repository": "jarvis-harbor",
       "docker_registry": "harbor-core.jarvis.local",
-      "harbor_secret_mounted_path": "/workspace/helm-creds"
+      "harbor_secret_mounted_path": "/workspace/helm-creds",
       "clone_async_batch_size": 20,
       "chart_async_batch_size": 20,
       "image_async_batch_size": 2
diff --git a/tools/gate/jarvis/5G-SA-core/smf/jarvis/development-pipeline/templates/config_map.yaml b/tools/gate/jarvis/5G-SA-core/smf/jarvis/development-pipeline/templates/config_map.yaml
index 989515f9..7a3f69d7 100644
--- a/tools/gate/jarvis/5G-SA-core/smf/jarvis/development-pipeline/templates/config_map.yaml
+++ b/tools/gate/jarvis/5G-SA-core/smf/jarvis/development-pipeline/templates/config_map.yaml
@@ -72,7 +72,7 @@ data:
       "chart_registry_url": "harbor-core.jarvis.local/chartrepo",
       "chart_repository": "jarvis-harbor",
       "docker_registry": "harbor-core.jarvis.local",
-      "harbor_secret_mounted_path": "/workspace/helm-creds"
+      "harbor_secret_mounted_path": "/workspace/helm-creds",
       "clone_async_batch_size": 20,
       "chart_async_batch_size": 20,
       "image_async_batch_size": 2
diff --git a/tools/gate/jarvis/5G-SA-core/udm/jarvis/development-pipeline/templates/config_map.yaml b/tools/gate/jarvis/5G-SA-core/udm/jarvis/development-pipeline/templates/config_map.yaml
index 55e7f307..74ddfd5d 100644
--- a/tools/gate/jarvis/5G-SA-core/udm/jarvis/development-pipeline/templates/config_map.yaml
+++ b/tools/gate/jarvis/5G-SA-core/udm/jarvis/development-pipeline/templates/config_map.yaml
@@ -72,7 +72,7 @@ data:
       "chart_registry_url": "harbor-core.jarvis.local/chartrepo",
       "chart_repository": "jarvis-harbor",
       "docker_registry": "harbor-core.jarvis.local",
-      "harbor_secret_mounted_path": "/workspace/helm-creds"
+      "harbor_secret_mounted_path": "/workspace/helm-creds",
       "clone_async_batch_size": 20,
       "chart_async_batch_size": 20,
       "image_async_batch_size": 2
diff --git a/tools/gate/jarvis/800-deploy-jarvis-projects.sh b/tools/gate/jarvis/800-deploy-jarvis-projects.sh
index cff319d9..bad87732 100755
--- a/tools/gate/jarvis/800-deploy-jarvis-projects.sh
+++ b/tools/gate/jarvis/800-deploy-jarvis-projects.sh
@@ -77,7 +77,7 @@ for jarvis_project in `find ./tools/gate/jarvis/5G-SA-core -maxdepth 1 -mindepth
   end=$((end + timeout))
   while true; do
     result="$(curl -L https://gerrit.jarvis.local/changes/${CHANGE_ID_COUNTER}/revisions/1/checks | tail -1 | jq -r .[].state)"
-    [ $result == "SUCCESSFUL" ] && break || [ $result == "FAILED" ] && break || true
+    [ $result == "SUCCESSFUL" ] && break || true
     sleep 25
     now=$(date +%s)
     if [ $now -gt $end ] ; then
diff --git a/tools/gate/jarvis/standard-container/assets/jarvis/build_docker_image.sh b/tools/gate/jarvis/standard-container/assets/jarvis/build_docker_image.sh
old mode 100644
new mode 100755
diff --git a/tools/gate/jarvis/standard-container/assets/jarvis/cleanup.sh b/tools/gate/jarvis/standard-container/assets/jarvis/cleanup.sh
old mode 100644
new mode 100755
diff --git a/tools/gate/jarvis/standard-container/assets/jarvis/deployment_manifests.sh b/tools/gate/jarvis/standard-container/assets/jarvis/deployment_manifests.sh
old mode 100644
new mode 100755
diff --git a/tools/gate/jarvis/standard-container/assets/jarvis/functional_deploy.sh b/tools/gate/jarvis/standard-container/assets/jarvis/functional_deploy.sh
old mode 100644
new mode 100755
diff --git a/tools/gate/jarvis/standard-container/assets/jarvis/functional_test.sh b/tools/gate/jarvis/standard-container/assets/jarvis/functional_test.sh
old mode 100644
new mode 100755
diff --git a/tools/gate/jarvis/standard-container/assets/jarvis/get_image_scan_results.sh b/tools/gate/jarvis/standard-container/assets/jarvis/get_image_scan_results.sh
old mode 100644
new mode 100755
diff --git a/tools/gate/jarvis/standard-container/assets/jarvis/get_kubeconfig.sh b/tools/gate/jarvis/standard-container/assets/jarvis/get_kubeconfig.sh
old mode 100644
new mode 100755
diff --git a/tools/gate/jarvis/standard-container/assets/jarvis/git_clone_chart_repo.sh b/tools/gate/jarvis/standard-container/assets/jarvis/git_clone_chart_repo.sh
old mode 100644
new mode 100755
diff --git a/tools/gate/jarvis/standard-container/assets/jarvis/git_clone_image_repo.sh b/tools/gate/jarvis/standard-container/assets/jarvis/git_clone_image_repo.sh
old mode 100644
new mode 100755
diff --git a/tools/gate/jarvis/standard-container/assets/jarvis/lint_dryrun_chart.sh b/tools/gate/jarvis/standard-container/assets/jarvis/lint_dryrun_chart.sh
old mode 100644
new mode 100755
diff --git a/tools/gate/jarvis/standard-container/assets/jarvis/package_chart.sh b/tools/gate/jarvis/standard-container/assets/jarvis/package_chart.sh
old mode 100644
new mode 100755
diff --git a/tools/gate/jarvis/standard-container/assets/jarvis/promote_artifacts.sh b/tools/gate/jarvis/standard-container/assets/jarvis/promote_artifacts.sh
old mode 100644
new mode 100755
diff --git a/tools/gate/jarvis/standard-container/assets/jarvis/publish_chart.sh b/tools/gate/jarvis/standard-container/assets/jarvis/publish_chart.sh
old mode 100644
new mode 100755
diff --git a/tools/gate/jarvis/standard-container/assets/jarvis/push_docker_image.sh b/tools/gate/jarvis/standard-container/assets/jarvis/push_docker_image.sh
old mode 100644
new mode 100755
diff --git a/tools/gate/jarvis/standard-container/assets/jarvis/setup_chart_config.sh b/tools/gate/jarvis/standard-container/assets/jarvis/setup_chart_config.sh
old mode 100644
new mode 100755
diff --git a/tools/gate/jarvis/standard-container/assets/jarvis/setup_cleanup_config.sh b/tools/gate/jarvis/standard-container/assets/jarvis/setup_cleanup_config.sh
old mode 100644
new mode 100755
diff --git a/tools/gate/jarvis/standard-container/assets/jarvis/setup_cluster_config.sh b/tools/gate/jarvis/standard-container/assets/jarvis/setup_cluster_config.sh
old mode 100644
new mode 100755
diff --git a/tools/gate/jarvis/standard-container/assets/jarvis/setup_image_config.sh b/tools/gate/jarvis/standard-container/assets/jarvis/setup_image_config.sh
old mode 100644
new mode 100755