diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7f0d82097ad7c450f9daa9eaaf6d28fdfbe16896..f8f791a90eb95c557a2157d9e753597467e6c3d6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,27 +1,51 @@
-image: containers.ethitter.com:443/docker/images/debian:jessie
-
 stages:
   - test_pre_build
   - build
   - test
   - deploy
 
+# General tests
 test_build_script:
   stage: test_pre_build
   image: koalaman/shellcheck-alpine:latest
   script:
     - shellcheck ./scripts/build.sh
 
-test_build_nginx:
+# Stretch
+test_build_nginx_stretch:
+  stage: build
+  image: containers.ethitter.com:443/docker/images/debian:stretch-dev
+  script:
+    - chmod +x ./scripts/build.sh
+    - ./scripts/build.sh
+  except:
+    - master
+
+build_nginx_stretch:
+  stage: build
+  image: containers.ethitter.com:443/docker/images/debian:stretch-dev
+  script:
+    - chmod +x ./scripts/build.sh
+    - ./scripts/build.sh
+  artifacts:
+    paths:
+      - artifacts
+  only:
+    - master
+
+# Jessie
+test_build_nginx_jessie:
   stage: build
+  image: containers.ethitter.com:443/docker/images/debian:jessie
   script:
     - chmod +x ./scripts/build.sh
     - ./scripts/build.sh
   except:
     - master
 
-build_nginx:
+build_nginx_jessie:
   stage: build
+  image: containers.ethitter.com:443/docker/images/debian:jessie
   script:
     - chmod +x ./scripts/build.sh
     - ./scripts/build.sh
diff --git a/scripts/build.sh b/scripts/build.sh
index 13305df0b621ada911131f8781709963fa7dd8e4..ea3678cab3e75e77965337da0337ab55b96cc0cd 100644
--- a/scripts/build.sh
+++ b/scripts/build.sh
@@ -17,7 +17,7 @@ echo ""
 NGINX_ARTIFACT_PATH="$OG_DIR/artifacts"
 export NGINX_ARTIFACT_PATH
 
-NGINX_BUILT_BINARY_PATH="$NGINX_ARTIFACT_PATH/nginx_${NGINX_TAG}_${OPENSSL_TAG}"
+NGINX_BUILT_BINARY_PATH="${NGINX_ARTIFACT_PATH}/nginx_$(lsb_release -sc)_${NGINX_TAG}_${OPENSSL_TAG}"
 export NGINX_BUILT_BINARY_PATH
 
 mkdir -p "$NGINX_ARTIFACT_PATH"