diff --git a/scripts/go-to-scripts-dir.sh b/scripts/go-to-scripts-dir.sh
index afb1338..77f62aa 100755
--- a/scripts/go-to-scripts-dir.sh
+++ b/scripts/go-to-scripts-dir.sh
@@ -1,5 +1,4 @@
 #!/usr/bin/env bash
 
 # Will be substituted at build time by the Maven Resource plugin filtering.
-cd ${project.build.directory}/${project.artifactId}-${project.version}/
-cd scripts/
\ No newline at end of file
+pushd ${project.build.directory}/${project.artifactId}-${project.version}/scripts
diff --git a/scripts/utils.sh b/scripts/utils.sh
index 3b04471..93ea78a 100644
--- a/scripts/utils.sh
+++ b/scripts/utils.sh
@@ -23,7 +23,7 @@ function exportPaths () {
     export OPENMRS_CONFIG_PATH=$DISTRO_PATH/configs/openmrs/initializer_config
     export OPENMRS_PROPERTIES_PATH=$DISTRO_PATH/configs/openmrs/properties
     export OPENMRS_MODULES_PATH=$DISTRO_PATH/binaries/openmrs/modules
-    export SPA_PATH=$DISTRO_PATH/spa
+    export SPA_PATH=/openmrs/spa
     export SENAITE_CONFIG_PATH=$DISTRO_PATH/configs/senaite/initializer_config
     export ODOO_EXTRA_ADDONS=$DISTRO_PATH/binaries/odoo/addons
     export ODOO_CONFIG_PATH=$DISTRO_PATH/configs/odoo/initializer_config/