diff --git a/archetypes/helm/src/main/resources/archetype-resources/deploy.sh b/archetypes/helm/src/main/resources/archetype-resources/deploy.sh
index a348a4fb..e4f72ae3 100755
--- a/archetypes/helm/src/main/resources/archetype-resources/deploy.sh
+++ b/archetypes/helm/src/main/resources/archetype-resources/deploy.sh
@@ -121,7 +121,10 @@ popd >/dev/null || exit
 diff() {
   echo "Request diff from last revision, please wait ..."
   echo ""
+  # temporarily disable the script from exiting on a non-zero status code
+  set +e
   helm diff upgrade --install "${RELEASE}" "${CHART}" "${ARGS[@]}"
+  set -e
 }
 
 tryRun(){
@@ -262,14 +265,16 @@ runAsWizard() {
 if [[ $WIZARD == "true" ]] ; then
   runAsWizard
 else
-  [[ $DIFF == "true" ]] && {
+  if [[ $DIFF == "true" ]] ; then
     diff
-  }
-  [[ $TRY_RUN == "true" ]] && {
+  fi
+
+  if [[ $TRY_RUN == "true" ]] ; then
     tryRun
-  }
+  fi
 
-  [[ $DEPLOY == "true" ]] && {
+  if [[ $DEPLOY == "true" ]] ; then
     execute
-  }
+  fi
+
 fi
diff --git a/archetypes/project/src/main/resources/archetype-resources/repository/webapp/src/main/templates/.gitkeep b/archetypes/project/src/main/resources/archetype-resources/repository/webapp/src/main/templates/.gitkeep
new file mode 100644
index 00000000..e69de29b