diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e14c8c862..4b155535a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -16,9 +16,8 @@ stages:
   - frontend:build
   - backend:build
   - test
-  - docker:build
+  - docker
   - prepare release
-  - upload
   - release
   
 node dependencies:
@@ -228,7 +227,7 @@ check:
   interruptible: true
 
 demo docker:
-  stage: docker:build
+  stage: docker
   script:
     - xzcat uniworx:exe:uniworx.nar.xz | nix-store --import
     - xzcat uniworx:exe:uniworxdb.nar.xz | nix-store --import
@@ -259,11 +258,11 @@ demo docker:
   interruptible: true
   rules:
     - if: $CI_COMMIT_REF_NAME =~ /^v[0-9].*/
-      when: manuel
+      when: manual
       allow_failure: true
 
 docker:
-  stage: docker:build
+  stage: docker
   script:
     - xzcat uniworx:exe:uniworx.nar.xz | nix-store --import
     - nix -L build -o result .#uniworxDocker
@@ -291,7 +290,7 @@ docker:
   interruptible: true
   rules:
     - if: $CI_COMMIT_REF_NAME =~ /^v[0-9].*/
-      when: manuel
+      when: manual
       allow_failure: true
 
 parse changelog:
@@ -317,7 +316,7 @@ parse changelog:
   interruptible: true
 
 upload docker:
-  stage: upload
+  stage: docker
   script:
     - xzcat uniworx:exe:uniworx.nar.xz | nix-store --import
     - nix -L run .#pushUniworxDocker
@@ -340,7 +339,7 @@ upload docker:
       when: on_success
 
 upload demo docker:
-  stage: upload
+  stage: docker
   script:
     - xzcat uniworx:exe:uniworx.nar.xz | nix-store --import
     - xzcat uniworx:exe:uniworxdb.nar.xz | nix-store --import