diff --git a/.gitignore b/.gitignore
index 9f11b755a17d8192c60f61cb17b8902dffbd9f23..5c51faa1eb5951d4b452856802fb184b9fda0f05 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 .idea/
+**/.DS_Store
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6d8e1adb30b154d366d64166c4e717f78733cbb1..0599c8dcfa7fd05e8db46ae810af8475b19012e3 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,70 +1,31 @@
-variables:
-  HELPERS_FILE: docker-build.yml
-  HELM_HELPERS_FILE: helm.yml
-  APP_HELM_NAME: signer
-  DOCKER_FILE: deployment/ci/Dockerfile
-
 stages:
-  - compile
   - test
-  - build
-  - helm
-  - deploy
 
-include:
-  - project: '${HELPERS_PATH}'
-    file: '${HELPERS_FILE}'
-  - template: 'Workflows/Branch-Pipelines.gitlab-ci.yml'
-  - project: "$HELM_HELPERS_PATH}"
-    file: "${HELM_HELPERS_FILE}"
+before_script:
+  - ln -s /builds /go/src/gitlab.eclipse.org
+  - cd /go/src/gitlab.eclipse.org/${CI_PROJECT_PATH}
 
-lint:
+linters:
   image: golangci/golangci-lint:latest
   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.20.3
+  image: golang:1.21.3
   stage: test
-  tags:
-    - amd64-docker
   script:
     - go version
     - go test $(go list ./... | grep -v /integration) -race -coverprofile=coverage.out
     - go tool cover -func=coverage.out
-  before_script:
-    - ln -s /builds /go/src/gitlab.com
-    - cd /go/src/gitlab.com/${CI_PROJECT_PATH}
   coverage: '/total:\s+\(statements\)\s+(\d+.\d+\%)/'
 
 govulncheck:
-  image: golang:1.20.3
+  image: golang:1.21.3
   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
-
-helm-lint:
-  extends: .helm-lint
-  stage: helm
-  tags:
-    - amd64-docker
diff --git a/deployment/ci/Dockerfile b/deployment/ci/Dockerfile
index 95aaa5e2d34796537a03e708e280f66478344a2b..151c3c7e33e6cf9c1e66ed76f560df121160f9cb 100644
--- a/deployment/ci/Dockerfile
+++ b/deployment/ci/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.20.3-alpine3.17 as builder
+FROM golang:1.21.3-alpine3.17 as builder
 
 RUN apk add git
 
diff --git a/deployment/compose/Dockerfile b/deployment/compose/Dockerfile
index 1d30b8ad5d8b25767263ecf44be4c0e814cbb56a..ff9ca4c9df44bb8233f02846e58990a2b0c4a16d 100644
--- a/deployment/compose/Dockerfile
+++ b/deployment/compose/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.20.3
+FROM golang:1.21.3
 
 RUN go install github.com/ysmood/kit/cmd/guard@v0.25.11