diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2a71c87f3..39462ca0e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -42,14 +42,15 @@ default:
 
 
 stages:
-  - prepare
+  - setup
+  - containers
   - frontend
   - backend
   - release # TODO
 
 
-dynamic:prepare:
-  stage: prepare
+setup:dynamic:
+  stage: setup
   before_script:
     - apt-get -y update
     - apt-get -y install git
@@ -65,10 +66,10 @@ dynamic:prepare:
       - frontend.yml
       - backend.yml
 
-container:frontend: &container-frontend
-  stage: prepare
+containers:frontend: &containers-frontend
+  stage: containers
   needs:
-    - dynamic:prepare
+    - setup:dynamic
   image: ${IMAGE_BUILDER}
   script:
     - FRONTEND_IMAGE_VERSION=`cat frontend-image-version`
@@ -78,15 +79,15 @@ container:frontend: &container-frontend
     - changes:
         - docker/frontend/Dockerfile
   interruptible: false
-container:frontend:manual:
-  <<: *container-frontend
+containers:frontend:manual:
+  <<: *containers-frontend
   rules:
     - when: manual
 
-container:backend: &container-backend
-  stage: prepare
+containers:backend: &containers-backend
+  stage: containers
   needs:
-    - dynamic:prepare
+    - setup:dynamic
   image: ${IMAGE_BUILDER}
   script:
     - BACKEND_IMAGE_VERSION=`cat backend-image-version`
@@ -96,8 +97,8 @@ container:backend: &container-backend
     - changes:
         - docker/backend/Dockerfile
   interruptible: false
-container:backend:manual:
-  <<: *container-backend
+containers:backend:manual:
+  <<: *containers-backend
   rules:
     - when: manual
 
@@ -105,27 +106,27 @@ container:backend:manual:
 frontend:
   stage: frontend
   needs:
-    - dynamic:prepare
-    - job: container:frontend
+    - setup:dynamic
+    - job: containers:frontend
       optional: true
   trigger:
     strategy: depend
     include:
       - artifact: frontend.yml
-        job: dynamic:prepare
+        job: setup:dynamic
 
 backend:
   stage: backend
   needs:
-    - dynamic:prepare
-    - job: container:backend
+    - setup:dynamic
+    - job: containers:backend
       optional: true
     - frontend
   trigger:
     strategy: depend
     include:
-      - artifact: frontend.yml
-        job: dynamic:prepare
+      - artifact: backend.yml
+        job: setup:dynamic
 
 
 # frontend dependencies: