diff --git a/Dockerfile b/Dockerfile
index 10686600305..a1882fe603c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -11,4 +11,3 @@ COPY . .
 EXPOSE 9999
 
 CMD ["./run.sh"]
-
diff --git a/deploy.sh b/deploy.sh
index 2bd55819227..c345e46e9ca 100755
--- a/deploy.sh
+++ b/deploy.sh
@@ -6,7 +6,7 @@ curl -sL http://dl.teads.net/teads-central/get.sh | sh -
 
 # DOCKER_IMAGE is mandatory.
 DOCKER_IMAGE=prebid
-DOCKER_TAG="master"
+DOCKER_TAG="master-teads"
 
 # DOCKER_IMAGE_ARTIFACTS_PATH is mandatory (where the files are in the docker image, this can be found in the Dockerfile).
 DOCKER_IMAGE_ARTIFACTS_PATH=build/dist
diff --git a/gulpfile.js b/gulpfile.js
index dee92ac32c8..77f660469c8 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -580,6 +580,7 @@ gulp.task('bundle', gulpBundle.bind(null, false)); // used for just concatenatin
 gulp.task('copy-quality', gulp.series(copyQuality));
 gulp.task('build-distrib', gulp.series(buildTeadsPrebidBundle));
 gulp.task('build-teads-adapter-prod', gulp.series(buildTeadsAdapater));
+gulp.task('connect-server', gulp.series(exposeServer));
 
 
 // build task for reviewers, runs test-coverage, serves, without watching
diff --git a/run.sh b/run.sh
index ef6cb6bba48..01c436f5e28 100755
--- a/run.sh
+++ b/run.sh
@@ -3,8 +3,6 @@ set -xe
 
 ./node_modules/gulp/bin/gulp.js build
 ./node_modules/gulp/bin/gulp.js copy-quality
-./node_modules/gulp/bin/gulp.js build-distrib
-./node_modules/gulp/bin/gulp.js build-teads-adapter-prod
 
 declare -a arrenv=(
   "TRACKING_PORT_8080_TCP_ADDR"
@@ -31,4 +29,4 @@ do
   fi
 done
 
-./node_modules/gulp/bin/gulp.js express
+./node_modules/gulp/bin/gulp.js connect-server
diff --git a/test.sh b/test.sh
index cc54b5c4969..9a5f9811fed 100755
--- a/test.sh
+++ b/test.sh
@@ -27,7 +27,10 @@ docker run --rm -i --privileged \
   -w /var/www \
   ${REG_URL}/npm-builder:node-6-qa \
   sh -c "npm install && \
-    ./node_modules/gulp/bin/gulp.js test
+    ./node_modules/gulp/bin/gulp.js test&& \
+    ./node_modules/gulp/bin/gulp.js build && \
+    ./node_modules/gulp/bin/gulp.js build-distrib && \
+    ./node_modules/gulp/bin/gulp.js build-teads-adapter-prod
   "
 
 # Build