diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2571797372a0b8e9373f201fc89a0a5b1244c79d..c96bb6a3193eb5b52984324d6e8942c63134eac1 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,19 +1,21 @@
 variables:
   HELPERS_FILE: docker-build.yml
-  APP_HELM_NAME: infohub
+  HELM_HELPERS_FILE: helm-package.yml
+  APP_HELM_NAME: cache
   DOCKER_FILE: deployment/ci/Dockerfile
 
 stages:
   - compile
   - test
   - build
-  - manifest
   - deploy
 
 include:
-  - project: '${HELPERS_PATH}'
-    file: '${HELPERS_FILE}'
-  - template: 'Workflows/Branch-Pipelines.gitlab-ci.yml'
+  - 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:v1.50.1
@@ -27,6 +29,12 @@ lint:
     - ln -s /builds /go/src/gitlab.com
     - cd /go/src/gitlab.com/${CI_PROJECT_PATH}
 
+helm-lint:
+  extends: .helm-lint
+  stage: test
+  tags:
+    - amd64-docker
+
 unit tests:
   image: golang:1.20.5
   extends: .gotest
@@ -55,15 +63,3 @@ amd64:
   stage: build
   tags:
     - amd64-docker
-
-manifest:
-  extends: .manifest-amd64
-  stage: manifest
-
-cloud:
-  extends: .manifest-cloud
-  stage: manifest
-
-release:
-  extends: .manifest-release
-  stage: manifest