diff --git a/stack-orchestrator/container-build/cerc-go-nitro/build.sh b/stack-orchestrator/container-build/cerc-go-nitro/build.sh
index 22927bc..fe9d0f0 100755
--- a/stack-orchestrator/container-build/cerc-go-nitro/build.sh
+++ b/stack-orchestrator/container-build/cerc-go-nitro/build.sh
@@ -5,4 +5,4 @@ source ${CERC_CONTAINER_BASE_DIR}/build-base.sh
 
 SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
 
-docker build -t cerc/go-nitro:local -f ${SCRIPT_DIR}/Dockerfile ${build_command_args} ${CERC_REPO_BASE_DIR}
\ No newline at end of file
+docker build -t cerc/go-nitro:local -f ${SCRIPT_DIR}/Dockerfile ${build_command_args} $SCRIPT_DIR
\ No newline at end of file
diff --git a/stack-orchestrator/container-build/cerc-nitro-client/build.sh b/stack-orchestrator/container-build/cerc-nitro-client/build.sh
index 605541b..b4ec2a1 100755
--- a/stack-orchestrator/container-build/cerc-nitro-client/build.sh
+++ b/stack-orchestrator/container-build/cerc-nitro-client/build.sh
@@ -6,4 +6,4 @@ source ${CERC_CONTAINER_BASE_DIR}/build-base.sh
 # See: https://stackoverflow.com/a/246128/1701505
 SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
 
-docker build -t cerc/nitro-client:local -f ${SCRIPT_DIR}/Dockerfile ${build_command_args} ${CERC_REPO_BASE_DIR}
+docker build -t cerc/nitro-client:local -f ${SCRIPT_DIR}/Dockerfile ${build_command_args} $SCRIPT_DIR