diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6b9e7866678b844b696ec61c3d04810cba322346..d375bf88e5ad719e88911d1686e00a57c282ce9f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -8,9 +8,7 @@ cache:
     - build/
 
 stages:
-  - build
-  - verification
-  - publish
+  - everything
   - cleanup
 
 
@@ -19,20 +17,104 @@ stages:
 # Stage: build
 # ===========================================================================
 
-gradlew-bootJar:
-  stage: build
-  tags:
-    - worker
-  image: eclipse-temurin:11-jdk-alpine
-  script:
-    - ./gradlew bootJar
-
-
-docker-build-latest:
-  stage: build
+# gradlew-bootJar:
+#   stage: build
+#   tags:
+#     - worker
+#   image: eclipse-temurin:11-jdk-alpine
+#   script:
+#     - ./gradlew bootJar
+# 
+# 
+# docker-build-latest:
+#   stage: build
+#   image: docker:git
+#   tags:
+#     - cache
+#   only:
+#     refs:
+#       - main
+#   except:
+#     variables:
+#       - $CI_COMMIT_TAG
+#   before_script:
+#     - mkdir -p build
+#   script:
+#     - docker build -t $DOCKER_NAMESPACE/$PROJECT_NAME:latest .
+#     - docker save -o build/image.tar $DOCKER_NAMESPACE/$PROJECT_NAME:latest
+# 
+# 
+# docker-build-tag:
+#   stage: build
+#   image: docker:git
+#   tags:
+#     - cache
+#   only:
+#     variables:
+#       - $CI_COMMIT_TAG
+#   before_script:
+#     - mkdir -p build
+#   script:
+#     - docker build -t $DOCKER_NAMESPACE/$PROJECT_NAME:$CI_COMMIT_TAG .
+#     - docker save -o build/image.tar $DOCKER_NAMESPACE/$PROJECT_NAME:$CI_COMMIT_TAG 
+# 
+# 
+# 
+# # ===========================================================================
+# # Stage: test
+# # ===========================================================================
+# 
+# verification-unit:
+#   stage: verification
+#   image: eclipse-temurin:11-jdk-alpine
+#   tags:
+#     - worker
+#   allow_failure: true
+#   script:
+#     - ./gradlew test
+#   artifacts:
+#     when: always
+#     reports:
+#       junit: build/test-results/test/**/TEST-*.xml
+#     expire_in: 10 mins
+# 
+# 
+# # ===========================================================================
+# # Stage: publish
+# # ===========================================================================
+# 
+# docker-push-latest:
+#   stage: publish
+#   image: docker
+#   tags:
+#     - cache
+#   only:
+#     - main
+#   before_script:
+#     - docker login -u $DOCKER_USERNAME -p $DOCKER_TOKEN $DOCKER_REGISTRY
+#   script:
+#     - docker load -i build/image.tar
+#     - docker push $DOCKER_NAMESPACE/$PROJECT_NAME:latest
+# 
+# docker-push-tag:
+#   stage: publish
+#   image: docker
+#   tags:
+#     - cache
+#   only:
+#     variables:
+#       - $CI_COMMIT_TAG
+#   before_script:
+#     - docker login -u $DOCKER_USERNAME -p $DOCKER_TOKEN $DOCKER_REGISTRY
+#   script:
+#     - docker load -i build/image.tar
+#     - docker push $DOCKER_NAMESPACE/$PROJECT_NAME:$CI_COMMIT_TAG
+
+do-everything:
+  stage: everything
   image: docker:git
   tags:
-    - cache
+    - worker
   only:
     refs:
       - main
@@ -43,74 +125,9 @@ docker-build-latest:
     - mkdir -p build
   script:
     - docker build -t $DOCKER_NAMESPACE/$PROJECT_NAME:latest .
-    - docker save -o build/image.tar $DOCKER_NAMESPACE/$PROJECT_NAME:latest
-
-
-docker-build-tag:
-  stage: build
-  image: docker:git
-  tags:
-    - cache
-  only:
-    variables:
-      - $CI_COMMIT_TAG
-  before_script:
-    - mkdir -p build
-  script:
-    - docker build -t $DOCKER_NAMESPACE/$PROJECT_NAME:$CI_COMMIT_TAG .
-    - docker save -o build/image.tar $DOCKER_NAMESPACE/$PROJECT_NAME:$CI_COMMIT_TAG 
-
-
-
-# ===========================================================================
-# Stage: test
-# ===========================================================================
-
-verification-unit:
-  stage: verification
-  image: eclipse-temurin:11-jdk-alpine
-  tags:
-    - worker
-  allow_failure: true
-  script:
-    - ./gradlew test
-  artifacts:
-    when: always
-    reports:
-      junit: build/test-results/test/**/TEST-*.xml
-    expire_in: 10 mins
-
-
-# ===========================================================================
-# Stage: publish
-# ===========================================================================
-
-docker-push-latest:
-  stage: publish
-  image: docker
-  tags:
-    - cache
-  only:
-    - main
-  before_script:
-    - docker login -u $DOCKER_USERNAME -p $DOCKER_TOKEN $DOCKER_REGISTRY
-  script:
-    - docker load -i build/image.tar
+    - docker push $DOCKER_NAMESPACE/$PROJECT_NAME:$CI_COMMIT_TAG
     - docker push $DOCKER_NAMESPACE/$PROJECT_NAME:latest
 
-docker-push-tag:
-  stage: publish
-  image: docker
-  tags:
-    - cache
-  only:
-    variables:
-      - $CI_COMMIT_TAG
-  before_script:
-    - docker login -u $DOCKER_USERNAME -p $DOCKER_TOKEN $DOCKER_REGISTRY
-  script:
-    - docker load -i build/image.tar
-    - docker push $DOCKER_NAMESPACE/$PROJECT_NAME:$CI_COMMIT_TAG
 
 cleanup:
   stage: cleanup