diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 23f09161a2ed54d62e2917adf46697c9a66befaf..2571797372a0b8e9373f201fc89a0a5b1244c79d 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: infohub
   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}"
+  - project: '${HELPERS_PATH}'
+    file: '${HELPERS_FILE}'
+  - template: 'Workflows/Branch-Pipelines.gitlab-ci.yml'
 
 lint:
   image: golangci/golangci-lint:v1.50.1
@@ -52,14 +49,21 @@ govulncheck:
     - go install golang.org/x/vuln/cmd/govulncheck@latest
     - govulncheck ./...
 
+
 amd64:
   extends: .docker-build
   stage: build
   tags:
     - amd64-docker
 
-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