diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 97f01d3f..dce230db 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -9,7 +9,7 @@ stages:
   - build
   - test
 
-build:
+code-checkout:
   stage: build
   script:
     - rm -rf .git/modules/docs .git/modules/libraries/fc ./docs ./libraries/fc
@@ -17,9 +17,28 @@ build:
     - git submodule update --init --recursive
     - rm -rf build
     - mkdir build
-    - cd build
+
+build:
+  stage: build  
+  script:
+    - mkdir build/mainnet
+    - cd build/mainnet
     - cmake -DCMAKE_BUILD_TYPE=Release ..
     - make -j$(nproc)
+  artifacts:
+  untracked: true
+  paths:
+   - build/libraries/
+   - build/programs/
+   - build/tests/  
+
+build-testnet:
+  stage: build
+  script:
+    - mkdir build/testnet
+    - cd build/testnet
+    - cmake -DBOOST_ROOT="$BOOST_ROOT" -DCMAKE_BUILD_TYPE=Release -DBUILD_PEERPLAYS_TESTNET=1 ..
+    - make -j$(nproc)  
   artifacts:
     untracked: true
     paths:
@@ -31,11 +50,14 @@ build:
 
 dockerize:
   stage: build
+  variables:
+    IMAGE: $CI_REGISTRY_IMAGE/$CI_COMMIT_REF_SLUG:$CI_COMMIT_SHA
+  before_script:
+    - docker info
+    - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
   script:
-    - docker build . -t $DOCKER_REPO:$CI_COMMIT_REF_NAME
-    - docker login -u $DOCKER_USER -p $DOCKER_PASS
-    - docker push $DOCKER_REPO:$CI_COMMIT_REF_NAME
-    - docker logout
+    - docker build -t $IMAGE .
+    - docker push $IMAGE
   tags:
     - builder
   when: manual