diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0e361f74ea71412aa5f1f8f2760ad8ebcfe13569..cd92e067898211feee8e4f9037159e8432f0c40b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -7,28 +7,35 @@ before_script:
   - chmod +x nginx-build
   - ./nginx-build -V
 
+after_script:
+  - mkdir -p ${CI_PROJECT_DIR}/${BUILD_DIR}
+  - mv $CI_PROJECT_DIR/nginx_${NGINX_VERSION}* $BUILD_DIR
+  - mv $CI_PROJECT_DIR/nginx-dbgsym_* $BUILD_DIR
+
 build-deb:jessie:
   stage: build
   image: containers.ethitter.com:443/docker/images/debian:jessie
   variables:
     NGINX_BINARY: $NGINX_BINARY_JESSIE
     NGINX_VERSION: $NGINX_VERSION_JESSIE
+    BUILD_DIR: 'build-jessie'
   script:
     - cd source
     - debuild -us -uc
   artifacts:
     paths:
-      - nginx_${NGINX_VERSION}*
-      - nginx-dbgsym_*
+      - $BUILD_DIR
 
 test-deb:jessie:
   stage: test
   image: containers.ethitter.com:443/docker/images/debian:jessie
   before_script:
-    - date
+    - export BUILD_DIR="${CI_PROJECT_DIR}/build-jessie"
   script:
-    - dpkg -i nginx_${NGINX_VERSION_JESSIE}*.deb
+    - dpkg -i ${BUILD_DIR}/nginx_${NGINX_VERSION_JESSIE}*.deb
     - nginx -V
+  after_script:
+    - ''
   dependencies:
     - build-deb:jessie
 
@@ -38,22 +45,24 @@ build-deb:stretch:
   variables:
     NGINX_BINARY: $NGINX_BINARY_STRETCH
     NGINX_VERSION: $NGINX_VERSION_STRETCH
+    BUILD_DIR: 'build-stretch'
   script:
     - cd source
     - debuild -us -uc
   artifacts:
     paths:
-      - nginx_${NGINX_VERSION}*
-      - nginx-dbgsym_*
+      - $BUILD_DIR
 
 test-deb:stretch:
   stage: test
   image: containers.ethitter.com:443/docker/images/debian:stretch
   before_script:
-    - date
+    - export BUILD_DIR="${CI_PROJECT_DIR}/build-stretch"
   script:
-    - dpkg -i nginx_${NGINX_VERSION_STRECTH}*.deb
+    - dpkg -i ${BUILD_DIR}/nginx_${NGINX_VERSION_STRECTH}*.deb
     - nginx -V
+  after_script:
+    - ''
   dependencies:
     - build-deb:stretch
 
@@ -63,21 +72,23 @@ build-deb:buster:
   variables:
     NGINX_BINARY: $NGINX_BINARY_BUSTER
     NGINX_VERSION: $NGINX_VERSION_BUSTER
+    BUILD_DIR: 'build-buster'
   script:
     - cd source
     - debuild -us -uc
   artifacts:
     paths:
-      - nginx_${NGINX_VERSION}*
-      - nginx-dbgsym_*
+      - $BUILD_DIR
 
 test-deb:buster:
   stage: test
   image: containers.ethitter.com:443/docker/images/debian:buster
   before_script:
-    - date
+    - export BUILD_DIR="${CI_PROJECT_DIR}/build-buster"
   script:
-    - dpkg -i nginx_${NGINX_VERSION_BUSTER}*.deb
+    - dpkg -i ${BUILD_DIR}/nginx_${NGINX_VERSION_BUSTER}*.deb
     - nginx -V
+  after_script:
+    - ''
   dependencies:
     - build-deb:buster