diff --git a/.gitea/workflows/build-publish.yaml b/.gitea/workflows/build-publish.yaml
index 5092ede..af5ef95 100644
--- a/.gitea/workflows/build-publish.yaml
+++ b/.gitea/workflows/build-publish.yaml
@@ -88,7 +88,7 @@ jobs:
 
       - name: Validate template
         run: |
-          if ~/.local/bin/dropshell validate template; then
+          if ~/.local/bin/dropshell validate ./infmap; then
             echo "Template validation passed"
           else
             echo "Template validation failed"
diff --git a/infmap/destroy.sh b/infmap/destroy.sh
index 1ac3747..12cecb6 100755
--- a/infmap/destroy.sh
+++ b/infmap/destroy.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 source "${AGENT_PATH}/common.sh"
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-cd "$SCRIPT_DIR"
+cd "$SCRIPT_DIR" || exit 1
 
 _check_required_env_vars "CONTAINER_NAME" "DATA_VOLUME"
 
diff --git a/infmap/install-pre.sh b/infmap/install-pre.sh
index 2dc6adf..864be4e 100755
--- a/infmap/install-pre.sh
+++ b/infmap/install-pre.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 source "${AGENT_PATH}/common.sh"
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-cd "$SCRIPT_DIR"
+cd "$SCRIPT_DIR" || exit 1
 
 _check_required_env_vars "CONTAINER_NAME" "IMAGE_REGISTRY" "IMAGE_REPO" "IMAGE_TAG"
 
diff --git a/infmap/install.sh b/infmap/install.sh
index 5235d54..ff061c0 100755
--- a/infmap/install.sh
+++ b/infmap/install.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 source "${AGENT_PATH}/common.sh"
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-cd "$SCRIPT_DIR"
+cd "$SCRIPT_DIR" || exit 1
 
 _check_required_env_vars "CONTAINER_NAME" "WEB_PORT" "SSH_KEY_PATH" "DATA_VOLUME" "IMAGE_REGISTRY" "IMAGE_REPO" "IMAGE_TAG"
 _check_docker_installed || _die "Docker test failed"
diff --git a/infmap/logs.sh b/infmap/logs.sh
index 046158d..7ee382a 100755
--- a/infmap/logs.sh
+++ b/infmap/logs.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 source "${AGENT_PATH}/common.sh"
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-cd "$SCRIPT_DIR"
+cd "$SCRIPT_DIR" || exit 1
 
 _check_required_env_vars "CONTAINER_NAME"
 
diff --git a/infmap/start.sh b/infmap/start.sh
index 89bf3b6..f7ba4bb 100755
--- a/infmap/start.sh
+++ b/infmap/start.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 source "${AGENT_PATH}/common.sh"
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-cd "$SCRIPT_DIR"
+cd "$SCRIPT_DIR" || exit 1
 
 _check_required_env_vars "CONTAINER_NAME" "DATA_VOLUME"
 
diff --git a/infmap/stop.sh b/infmap/stop.sh
index db8fb17..0ac5af4 100755
--- a/infmap/stop.sh
+++ b/infmap/stop.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 source "${AGENT_PATH}/common.sh"
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-cd "$SCRIPT_DIR"
+cd "$SCRIPT_DIR" || exit 1
 
 _check_required_env_vars "CONTAINER_NAME"
 
diff --git a/infmap/uninstall.sh b/infmap/uninstall.sh
index e5a71ab..83b796f 100755
--- a/infmap/uninstall.sh
+++ b/infmap/uninstall.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 source "${AGENT_PATH}/common.sh"
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-cd "$SCRIPT_DIR"
+cd "$SCRIPT_DIR" || exit 1
 
 _check_required_env_vars "CONTAINER_NAME"