diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c38e178..1f679aa 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -18,6 +18,6 @@ docker_build:
   stage: test
   script:
     - apk add docker-compose
-    - scripts/subinstallers/gen_prod_env.sh "$MISTBORN_DEFAULT_PASSWORD"
+    - bash scripts/subinstallers/gen_prod_env.sh "$MISTBORN_DEFAULT_PASSWORD"
     - docker-compose -f base.yml build
 
diff --git a/scripts/env/setup.sh b/scripts/env/setup.sh
index 31e7211..2e4eb47 100755
--- a/scripts/env/setup.sh
+++ b/scripts/env/setup.sh
@@ -41,7 +41,7 @@ echo "MISTBORN_BIND_IP=10.2.3.1" | sudo tee -a ${VAR_FILE}
 GIT_BRANCH=$(git -C /opt/mistborn symbolic-ref --short HEAD || echo "master")
 MISTBORN_TAG="${MISTBORN_MAJOR_VERSION}.${MISTBORN_MINOR_VERSION}"
 if [ ! -z "$MISTBORN_TEST_CONTAINER" ]; then
-    MISTBORN_TAG="test"	
+    MISTBORN_TAG="$MISTBORN_TEST_CONTAINER"
 else if [ "$GIT_BRANCH" == "master" ]; then
     MISTBORN_TAG="latest"
 fi