diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c92e8694f8f984638f7769e9cf29d719ff1b6adf..2571797372a0b8e9373f201fc89a0a5b1244c79d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,31 +1,69 @@
+variables:
+  HELPERS_FILE: docker-build.yml
+  APP_HELM_NAME: infohub
+  DOCKER_FILE: deployment/ci/Dockerfile
+
 stages:
+  - compile
   - test
+  - build
+  - manifest
+  - deploy
 
-before_script:
-  - ln -s /builds /go/src/gitlab.eclipse.org
-  - cd /go/src/gitlab.eclipse.org/${CI_PROJECT_PATH}
+include:
+  - project: '${HELPERS_PATH}'
+    file: '${HELPERS_FILE}'
+  - template: 'Workflows/Branch-Pipelines.gitlab-ci.yml'
 
-linters:
-  image: golangci/golangci-lint:latest
+lint:
+  image: golangci/golangci-lint:v1.50.1
   stage: test
+  tags:
+    - amd64-docker
   script:
-    - go version
     - golangci-lint --version
     - golangci-lint run
+  before_script:
+    - ln -s /builds /go/src/gitlab.com
+    - cd /go/src/gitlab.com/${CI_PROJECT_PATH}
 
 unit tests:
-  image: golang:1.21.5
+  image: golang:1.20.5
+  extends: .gotest
   stage: test
-  script:
-    - go version
-    - go test -race ./... -coverprofile=coverage.out
-    - go tool cover -func=coverage.out
+  tags:
+    - amd64-docker
+  before_script: []
   coverage: '/total:\s+\(statements\)\s+(\d+.\d+\%)/'
 
 govulncheck:
-  image: golang:1.21.5
+  image: golang:1.20.5
   stage: test
+  tags:
+    - amd64-docker
+  before_script:
+    - ln -s /builds /go/src/gitlab.com
+    - cd /go/src/gitlab.com/${CI_PROJECT_PATH}
   script:
     - go version
     - go install golang.org/x/vuln/cmd/govulncheck@latest
     - govulncheck ./...
+
+
+amd64:
+  extends: .docker-build
+  stage: build
+  tags:
+    - amd64-docker
+
+manifest:
+  extends: .manifest-amd64
+  stage: manifest
+
+cloud:
+  extends: .manifest-cloud
+  stage: manifest
+
+release:
+  extends: .manifest-release
+  stage: manifest