diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4d9f84270a8ec852f15baeae653bcc34c2ac7a27..f92de4ed3bc43b1337bb35a71a18ba444c412ae2 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,6 +1,5 @@
 variables:
   HELPERS_FILE: docker-build.yml
-  HELM_HELPERS_FILE: helm.yml
   APP_HELM_NAME: policy
   DOCKER_FILE: deployment/ci/Dockerfile
 
@@ -8,15 +7,13 @@ stages:
   - compile
   - test
   - build
-  - helm
+  - manifest
   - deploy
 
 include:
   - project: "${HELPERS_PATH}"
     file: "${HELPERS_FILE}"
   - template: "Workflows/Branch-Pipelines.gitlab-ci.yml"
-  - project: "$HELM_HELPERS_PATH}"
-    file: "${HELM_HELPERS_FILE}"
 
 lint:
   image: golangci/golangci-lint:latest
@@ -74,8 +71,14 @@ dockerize sync:
     - tags
     - integration
 
-helm-lint:
-  extends: .helm-lint
-  stage: helm
-  tags:
-    - amd64-docker
+manifest:
+  extends: .manifest-amd64
+  stage: manifest
+
+cloud:
+  extends: .manifest-cloud
+  stage: manifest
+
+release:
+  extends: .manifest-release
+  stage: manifest