diff --git a/scripts/build_application.sh b/scripts/build_application.sh
index 54e1bc70..a221535c 100755
--- a/scripts/build_application.sh
+++ b/scripts/build_application.sh
@@ -7,7 +7,7 @@ APPLICATION_ID=$4
 JDK_IMAGE=$5
 MVN_OPTS=$6
 
-cd "${WORKDIR}"/"${WORKFLOW_ID}"/"${APPLICATION_ID}" || exit
-${CONTAINER_ENGINE} run --rm -v "${WORKDIR}":/workdir -e MVN_OPTS="${MVN_OPTS}" -w /workdir/"${WORKFLOW_ID}"/"${APPLICATION_ID}" \
+cd "${WORKDIR}"/workflows/"${WORKFLOW_ID}"/"${APPLICATION_ID}" || exit
+${CONTAINER_ENGINE} run --rm -v "${WORKDIR}":/workdir -e MVN_OPTS="${MVN_OPTS}" -w /workdir/workflows/"${WORKFLOW_ID}"/"${APPLICATION_ID}" \
   --user root "${JDK_IMAGE}" mvn "${MVN_OPTS}" clean package -DskipTests
 
diff --git a/scripts/build_m2kfunc.sh b/scripts/build_m2kfunc.sh
index 301d5327..6c2b4c88 100755
--- a/scripts/build_m2kfunc.sh
+++ b/scripts/build_m2kfunc.sh
@@ -9,7 +9,7 @@ MVN_OPTS=$6
 
 VERSION="2.0.0"
 
-cd "${WORKDIR}"/"${WORKFLOW_ID}"/"${APPLICATION_ID}"/move2kubeAPI || exit
+cd "${WORKDIR}"/workflows/"${WORKFLOW_ID}"/"${APPLICATION_ID}"/move2kubeAPI || exit
 curl https://raw.githubusercontent.com/konveyor/move2kube-api/main/assets/openapi.json -o openapi.json
 
 rm -rf java-client
@@ -21,5 +21,5 @@ ${CONTAINER_ENGINE} run --rm -v "${PWD}":/tmp -e GENERATE_PERMISSIONS=true opena
   --group-id dev.parodos --artifact-id move2kube --artifact-version v${VERSION} \
   --library apache-httpclient
 
-${CONTAINER_ENGINE} run --rm -v "${WORKDIR}":/workdir -e MVN_OPTS="${MVN_OPTS}" -w /workdir/"${WORKFLOW_ID}" \
+${CONTAINER_ENGINE} run --rm -v "${WORKDIR}":/workdir -e MVN_OPTS="${MVN_OPTS}" -w /workdir/workflows/"${WORKFLOW_ID}" \
   "${JDK_IMAGE}" mvn "${MVN_OPTS}" -q clean install -DskipTests
\ No newline at end of file
diff --git a/scripts/create_automated_m2k_kfunc_pr.sh b/scripts/create_automated_m2k_kfunc_pr.sh
index 4d964030..3b7d5d15 100644
--- a/scripts/create_automated_m2k_kfunc_pr.sh
+++ b/scripts/create_automated_m2k_kfunc_pr.sh
@@ -17,7 +17,7 @@ git switch -c "${WORKFLOW_ID}"-autopr-"${TIMESTAMP}"
 
 ./hack/bump_chart_version.sh "${WORKFLOW_ID}" --bump-tag-version
 mkdir -p charts/"${WORKFLOW_ID}"/templates
-cp "${WORKDIR}"/"${WORKFLOW_ID}"/manifests/* charts/"${WORKFLOW_ID}"/templates
+cp "${WORKDIR}"/workflows/"${WORKFLOW_ID}"/manifests/* charts/"${WORKFLOW_ID}"/templates
 yq --inplace '.kfunction.image="quay.io/orchestrator/serverless-workflow-m2k-kfunc:'"${GITHUB_SHA}"'"' charts/move2kube/values.yaml
 git add -A
 
diff --git a/scripts/create_automated_pr.sh b/scripts/create_automated_pr.sh
index 0a099a5d..f44d9520 100644
--- a/scripts/create_automated_pr.sh
+++ b/scripts/create_automated_pr.sh
@@ -16,7 +16,7 @@ git switch -c "${WORKFLOW_ID}"-autopr-"${TIMESTAMP}"
 
 ./hack/bump_chart_version.sh "${WORKFLOW_ID}" --bump-tag-version
 mkdir -p charts/"${WORKFLOW_ID}"/templates
-cp "${WORKDIR}"/"${WORKFLOW_ID}"/manifests/* charts/"${WORKFLOW_ID}"/templates
+cp "${WORKDIR}"/workflows/"${WORKFLOW_ID}"/manifests/* charts/"${WORKFLOW_ID}"/templates
 git add -A
 
 git commit -m "(${WORKFLOW_ID}) Automated PR"
diff --git a/scripts/create_or_update_automated_pr.sh b/scripts/create_or_update_automated_pr.sh
index ff78566f..d2224a22 100644
--- a/scripts/create_or_update_automated_pr.sh
+++ b/scripts/create_or_update_automated_pr.sh
@@ -51,7 +51,7 @@ for pr in $prs; do
             if [ "${APPLICATION_UPDATE_COMMAND}" != "" ]; then
                 eval "${APPLICATION_UPDATE_COMMAND}" || exit 1
             else
-                cp "${WORKDIR}"/"${WORKFLOW_ID}"/manifests/* charts/"${WORKFLOW_ID}"/templates || exit 1
+                cp "${WORKDIR}"/workflows/"${WORKFLOW_ID}"/manifests/* charts/"${WORKFLOW_ID}"/templates || exit 1
             fi
             git add -A