diff --git a/.circleci/config.yml b/.circleci/config.yml
index e1bc37f..d0e1d90 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -29,12 +29,19 @@ builddeploy_steps: &builddeploy_steps
       - run: *install_dependency
       - run: *install_deploysuite
       - restore_cache: *restore_cache_settings_for_build
-      - run: ./build.sh ${APPNAME}
+      - run:
+          name: Running MasterScript.
+          command: | 
+            ./awsconfiguration.sh $DEPLOY_ENV
+            source awsenvconf
+            ./buildenv.sh -e $DEPLOY_ENV -b ${LOGICAL_ENV}-global-appvar,${LOGICAL_ENV}-${APPNAME}-appvar
+            ./build.sh ${APPNAME}
+            rm -f buildenvvar
       - save_cache: *save_cache_settings
       - deploy:
           name: Running MasterScript.
           command: |
-            ./awsconfiguration.sh $DEPLOY_ENV
+            # ./awsconfiguration.sh $DEPLOY_ENV
             source awsenvconf
             ./buildenv.sh -e $DEPLOY_ENV -b ${LOGICAL_ENV}-${APPNAME}-deployvar
             source buildenvvar
diff --git a/docker/Dockerfile b/docker/Dockerfile
index af56010..0df01c7 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -9,5 +9,6 @@ WORKDIR /ubahn_app
 
 # Install the dependencies from package.json
 RUN npm install
-RUN npm run install-client
+# RUN npm run install-client
+RUN ["/bin/bash", "-c", "source buildenvvar ;npm run install-client"]
 CMD npm start