diff --git a/templates/IaC/docker-compose.gitlab-ci.yml b/templates/IaC/docker-compose.gitlab-ci.yml
index ae510c1..a49cb79 100644
--- a/templates/IaC/docker-compose.gitlab-ci.yml
+++ b/templates/IaC/docker-compose.gitlab-ci.yml
@@ -48,7 +48,6 @@
     - docker-compose $COMPOSE_EXTRA_ARGS pull
     - docker-compose $COMPOSE_EXTRA_ARGS up -d --remove-orphans $COMPOSE_UP_EXTRA_ARGS
 
-#todo add docker compose renovate updater
 .docker-compose-validate:
   image: docker:20.10.16-alpine3.15
   stage: verify
diff --git a/templates/container/container-build.gitlab-ci.yml b/templates/container/container-build.gitlab-ci.yml
index d23a323..446257d 100644
--- a/templates/container/container-build.gitlab-ci.yml
+++ b/templates/container/container-build.gitlab-ci.yml
@@ -11,7 +11,10 @@
   extends: .container-build-common
   image: $MAVEN_IMAGE
   script:
-    - "cd $CONTEXT_LOCATION"
+    - >
+      if [ "$CONTEXT_LOCATION" != "" ]; then
+        cd $CONTEXT_LOCATION
+      fi
     - mvn $MAVEN_CLI_OPTS jib:buildTar -DskipTests -Djib.outputPaths.tar=$CI_PROJECT_DIR/image.tar $EXTRA_ARGS
 
 .container-build-jib-gradle:
@@ -20,7 +23,10 @@
   variables:
     EXTRA_ARGS: $GRADLE_EXTRA_ARGS
   script:
-    - "cd $CONTEXT_LOCATION"
+    - >
+      if [ "$CONTEXT_LOCATION" != "" ]; then
+        cd $CONTEXT_LOCATION
+      fi
     - ./gradlew $GRADLE_CLI_OPTS jibBuildTar -DskipTests -Djib.outputPaths.tar=$CI_PROJECT_DIR/image.tar $EXTRA_ARGS
 
 .container-build-kaniko:
diff --git a/templates/java/gradle/gradle-build.gitlab-ci.yml b/templates/java/gradle/gradle-build.gitlab-ci.yml
index f123165..453bde6 100644
--- a/templates/java/gradle/gradle-build.gitlab-ci.yml
+++ b/templates/java/gradle/gradle-build.gitlab-ci.yml
@@ -2,6 +2,10 @@
   stage: build
   image: $GRADLE_IMAGE
   before_script:
+    - >
+      if [ "$BACKEND_DIR" != "" ]; then
+        cd $BACKEND_DIR
+      fi
     # Replace version in Gradle file with $CI_COMMIT_TAG
     - >
       if [ ! -z "$CI_COMMIT_TAG" ] && [ ! -z "$PATH_TO_VERSION_FILE" ]; then
diff --git a/templates/java/gradle/gradle-database-diff.gitlab-ci.yml b/templates/java/gradle/gradle-database-diff.gitlab-ci.yml
index 8c9e068..df489a7 100644
--- a/templates/java/gradle/gradle-database-diff.gitlab-ci.yml
+++ b/templates/java/gradle/gradle-database-diff.gitlab-ci.yml
@@ -8,6 +8,11 @@ include:
   variables:
     GRADLE_EXTRA_OPTS: ""
     PATH_TO_DIFF: "build/db-diff.xml"
+  before_script:
+    - >
+      if [ "$BACKEND_DIR" != "" ]; then
+        cd $BACKEND_DIR
+      fi
   script:
     - ./gradlew liquibase:update liquibase:diff $GRADLE_CLI_OPTS
 
diff --git a/templates/java/gradle/gradle-license.gitlab-ci.yml b/templates/java/gradle/gradle-license.gitlab-ci.yml
index c54f7f7..1f3a3b0 100644
--- a/templates/java/gradle/gradle-license.gitlab-ci.yml
+++ b/templates/java/gradle/gradle-license.gitlab-ci.yml
@@ -1,6 +1,11 @@
 .gradle-licence-bom:
   image: $GRADLE_IMAGE
   stage: build
+  before_script:
+    - >
+      if [ "$BACKEND_DIR" != "" ]; then
+        cd $BACKEND_DIR
+      fi
   script:
     - "cd $BACKEND_DIR"
     - "./gradlew --build-cache cyclonedxBom $GRADLE_CLI_OPTS"
diff --git a/templates/java/gradle/gradle-verify.gitlab-ci.yml b/templates/java/gradle/gradle-verify.gitlab-ci.yml
index d8fd92d..0d56fb3 100644
--- a/templates/java/gradle/gradle-verify.gitlab-ci.yml
+++ b/templates/java/gradle/gradle-verify.gitlab-ci.yml
@@ -1,6 +1,11 @@
 .gradle-verify:
   image: $GRADLE_IMAGE
   stage: verify
+  before_script:
+    - >
+      if [ "$BACKEND_DIR" != "" ]; then
+        cd $BACKEND_DIR
+      fi
   script:
     - "./gradlew --build-cache test $GRADLE_CLI_OPTS"
   artifacts:
diff --git a/templates/java/maven/maven-build.gitlab-ci.yml b/templates/java/maven/maven-build.gitlab-ci.yml
index 09cc16a..e719459 100644
--- a/templates/java/maven/maven-build.gitlab-ci.yml
+++ b/templates/java/maven/maven-build.gitlab-ci.yml
@@ -2,7 +2,10 @@
   stage: build
   image: $MAVEN_IMAGE
   before_script:
-    - "cd $BACKEND_DIR"
+    - >
+      if [ "$BACKEND_DIR" != "" ]; then
+        cd $BACKEND_DIR
+      fi
     - >
       if [ ! -z "$CI_COMMIT_TAG" ]; then
         mvn $MVN_EXTRA_ARGS $MAVEN_CLI_OPTS versions:set -DnewVersion=$CI_COMMIT_TAG -DgenerateBackupPoms=false
diff --git a/templates/java/maven/maven-database-diff.gitlab-ci.yml b/templates/java/maven/maven-database-diff.gitlab-ci.yml
index 58eccd8..974cf31 100644
--- a/templates/java/maven/maven-database-diff.gitlab-ci.yml
+++ b/templates/java/maven/maven-database-diff.gitlab-ci.yml
@@ -8,8 +8,12 @@ include:
   variables:
     MAVEN_EXTRA_OPTS: ""
     PATH_TO_DIFF: "target/db-diff.xml"
+  before_script:
+    - >
+      if [ "$BACKEND_DIR" != "" ]; then
+        cd $BACKEND_DIR
+      fi
   script:
-    - "cd $BACKEND_DIR"
     - mvn compile liquibase:update liquibase:diff $MAVEN_EXTRA_OPTS
   artifacts:
     when: on_failure
diff --git a/templates/java/maven/maven-dependencies.gitlab-ci.yml b/templates/java/maven/maven-dependencies.gitlab-ci.yml
index 5296dea..1cf5920 100644
--- a/templates/java/maven/maven-dependencies.gitlab-ci.yml
+++ b/templates/java/maven/maven-dependencies.gitlab-ci.yml
@@ -1,6 +1,10 @@
 .maven-dependencies:
   stage: dependencies
   image: $MAVEN_IMAGE
+  before_script:
+    - >
+      if [ "$BACKEND_DIR" != "" ]; then
+        cd $BACKEND_DIR
+      fi
   script:
-    - "cd $BACKEND_DIR"
     - "mvn $MAVEN_CLI_OPTS dependency:resolve"
\ No newline at end of file
diff --git a/templates/java/maven/maven-license.gitlab-ci.yml b/templates/java/maven/maven-license.gitlab-ci.yml
index 54b2fb4..a7fff6e 100644
--- a/templates/java/maven/maven-license.gitlab-ci.yml
+++ b/templates/java/maven/maven-license.gitlab-ci.yml
@@ -1,8 +1,12 @@
 .maven-licence-bom:
   image: $MAVEN_IMAGE
   stage: build
+  before_script:
+    - >
+      if [ "$BACKEND_DIR" != "" ]; then
+        cd $BACKEND_DIR
+      fi
   script:
-    - "cd $BACKEND_DIR"
     - mvn cyclonedx:makeBom
   artifacts:
     when: always
diff --git a/templates/java/maven/maven-verify.gitlab-ci.yml b/templates/java/maven/maven-verify.gitlab-ci.yml
index ce8647a..3ddf4ca 100644
--- a/templates/java/maven/maven-verify.gitlab-ci.yml
+++ b/templates/java/maven/maven-verify.gitlab-ci.yml
@@ -1,8 +1,12 @@
 .maven-verify:
   image: $MAVEN_IMAGE
   stage: verify
+  before_script:
+    - >
+      if [ "$BACKEND_DIR" != "" ]; then
+        cd $BACKEND_DIR
+      fi
   script:
-    - "cd $BACKEND_DIR"
     - mvn $MAVEN_CLI_OPTS verify
   artifacts:
     expire_in: 2 weeks
diff --git a/templates/static-analysis/sonar-7.gitlab-ci.yml b/templates/static-analysis/sonar-7.gitlab-ci.yml
index b9f7f0e..7288223 100644
--- a/templates/static-analysis/sonar-7.gitlab-ci.yml
+++ b/templates/static-analysis/sonar-7.gitlab-ci.yml
@@ -12,6 +12,11 @@
 .sonar-maven:
   extends: .sonar-template-common
   image: $MAVEN_IMAGE
+  before_script:
+    - >
+      if [ "$BACKEND_DIR" != "" ]; then
+        cd $BACKEND_DIR
+      fi
   script:
     - mvn $MAVEN_CLI_OPTS test sonar:sonar
       "-Dsonar.host.url=$SONAR_HOST_URL"
@@ -26,6 +31,11 @@
 .sonar-gradle:
   extends: .sonar-template-common
   image: $GRADLE_IMAGE
+  before_script:
+    - >
+      if [ "$BACKEND_DIR" != "" ]; then
+        cd $BACKEND_DIR
+      fi
   script:
     - ./gradlew $GRADLE_OPTS $GRADLE_CLI_OPTS sonarqube 
       "-Dsonar.host.url=$SONAR_HOST_URL"
diff --git a/templates/static-analysis/sonar-8.gitlab-ci.yml b/templates/static-analysis/sonar-8.gitlab-ci.yml
index 4831870..befef7a 100644
--- a/templates/static-analysis/sonar-8.gitlab-ci.yml
+++ b/templates/static-analysis/sonar-8.gitlab-ci.yml
@@ -11,6 +11,11 @@
 .sonar-maven:
   extends: .sonar-template-common
   image: $MAVEN_IMAGE
+  before_script:
+    - >
+      if [ "$BACKEND_DIR" != "" ]; then
+        cd $BACKEND_DIR
+      fi
   script:
     - mvn $MAVEN_CLI_OPTS test sonar:sonar
       "-Dsonar.host.url=$SONAR_HOST_URL"
@@ -24,6 +29,11 @@
 .sonar-gradle:
   extends: .sonar-template-common
   image: $GRADLE_IMAGE
+  before_script:
+    - >
+      if [ "$BACKEND_DIR" != "" ]; then
+        cd $BACKEND_DIR
+      fi
   script:
     - ./gradlew $GRADLE_OPTS sonarqube $GRADLE_CLI_OPTS
       "-Dsonar.host.url=$SONAR_HOST_URL"