diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ae94bb36c52bf2fe5c355b1230c6facdaa45ec1b..a3ab6e8d8b653e00ec4c89f0b68aab5568f36c98 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,32 +1,69 @@
+variables:
+  HELPERS_FILE: docker-build.yml
+  APP_HELM_NAME: task
+  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:
+lint:
   image: golangci/golangci-lint:latest
   stage: test
+  tags:
+    - amd64-docker
+  before_script:
+    - ln -s /builds /go/src/code.vereign.com
+    - cd /go/src/code.vereign.com/${CI_PROJECT_PATH}
   script:
+    - go version
     - golangci-lint --version
     - golangci-lint run
-    - cd ./cmd/sync
-    - golangci-lint run
 
 unit tests:
-  image: golang:1.21.5
+  image: golang:1.21.6
+  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.21.6
   stage: test
+  tags:
+    - amd64-docker
+  before_script:
+    - ln -s /builds /go/src/code.vereign.com
+    - cd /go/src/code.vereign.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
diff --git a/deployment/ci/Dockerfile b/deployment/ci/Dockerfile
index b726da0bc5e6ec8fdae1791fc8695b44b469084c..6a77712f539e3c46abdd359756689ebd64ac3fd2 100644
--- a/deployment/ci/Dockerfile
+++ b/deployment/ci/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.21.5-alpine3.17 as builder
+FROM golang:1.21.6-alpine3.17 as builder
 
 RUN apk add git
 
diff --git a/deployment/compose/Dockerfile b/deployment/compose/Dockerfile
index 0d3e29b2d81f81e15405b3ccf86785f4379c8412..33163798d44c1e3140e0745b635630ce6cf54cf4 100644
--- a/deployment/compose/Dockerfile
+++ b/deployment/compose/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.21.5
+FROM golang:1.21.6
 
 RUN go install github.com/ysmood/kit/cmd/guard@v0.25.11