diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 44038b97..cda41654 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -8,8 +8,9 @@ include:
 stages:
   - build
   - test
+  - dockerize
 
-build:
+build-mainnet:
   stage: build
   script:
     - rm -rf .git/modules/docs .git/modules/libraries/fc ./docs ./libraries/fc
@@ -29,10 +30,10 @@ build:
   tags:
     - builder
 
-test:
+test-mainnet:
   stage: test
   dependencies:
-    - build
+    - build-mainnet
   script:
     - ./build/libraries/fc/tests/all_tests
     - ./build/tests/betting_test --log_level=message
@@ -41,16 +42,20 @@ test:
   tags:
     - builder
 
-dockerize:
-  stage: build
+dockerize-mainnet:
+  stage: dockerize
+  dependencies:
+    - test-mainnet
   variables:
-    IMAGE: $CI_REGISTRY_IMAGE/$CI_COMMIT_REF_SLUG:$CI_COMMIT_SHA
+    IMAGE: $CI_REGISTRY_IMAGE/mainnet/$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 $IMAGE .
+    - docker build --no-cache -t $IMAGE .
     - docker push $IMAGE
+  after_script:
+    - docker rmi $IMAGE
   tags:
     - builder
   when:
@@ -97,3 +102,24 @@ test-testnet:
     manual
   timeout:
     1h
+
+dockerize-testnet:
+  stage: dockerize
+  dependencies:
+    - test-testnet
+  variables:
+    IMAGE: $CI_REGISTRY_IMAGE/testnet/$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 --no-cache -t $IMAGE .
+    - docker push $IMAGE
+  after_script:
+    - docker rmi $IMAGE
+  tags:
+    - builder
+  when:
+    manual
+  timeout:
+    3h