diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a15d084dbd8b9c0215fec0e94ca463030bd12861..53166ecba2414b020f375f2c44760e2d34482179 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,21 +1,94 @@
-image: $HELM_IMAGE
-
-include:
-  - project: 'gaiax/tsa/ci-helpers'
-    file: 'helm-package.yml'
+---
+variables:
+  HELPERS_FILE: build-eclipse.yml
+  HELM_HELPERS_FILE: helm-eclipse.yml
+  APP_HELM_NAME: task
+  DOCKER_FILE: app/deployment/ci/Dockerfile
 
 stages:
+  - test
+  - build
+  - manifest
   - lint
   - package
+  - deploy
+
+include:
+  - project: "${HELPERS_PATH}"
+    file: 'build-eclipse.yml'
+  - template: "Workflows/Branch-Pipelines.gitlab-ci.yml"
+  - project: "${HELPERS_PATH}"
+    file: 'helm-eclipse.yml'
+
+
+lint:
+  image: golangci/golangci-lint:latest
+  stage: test
+  tags:
+    - amd64-docker
+  script:
+    - golangci-lint --version
+    - golangci-lint run
+  before_script:
+    - ln -s /builds /go/src/gitlab.com
+    - cd /go/src/gitlab.com/${CI_PROJECT_PATH}/app
+
+unit tests:
+  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}/app
+  coverage: '/total:\s+\(statements\)\s+(\d+.\d+\%)/'
+
+govulncheck:
+  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}/app
+  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
 
 helm-lint:
+  image: ${HELM_IMAGE}
   extends: .helm-lint
   stage: lint
   tags:
     - amd64-docker
 
 helm-package:
+  image: ${HELM_IMAGE}
   extends: .helm-package
   stage: package
   tags:
     - amd64-docker
+  needs: ["helm-lint"]
diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000000000000000000000000000000000000..c7f7c5ecc99abb9f148d3d94910fb490a49d5fd2
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,4 @@
+[submodule "app"]
+	path = app
+	url = https://gitlab.eclipse.org/eclipse/xfsc/tsa/task.git
+	branch = main
diff --git a/Chart.yaml b/Chart.yaml
index 629883890405da6c55f83d889dce8769d966780d..ac59983b09d750db35c56e164da5a97b1ba8b857 100644
--- a/Chart.yaml
+++ b/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
-appVersion: v1.1.1
+appVersion: v1.1.2
 description: task deployment
 name: task
-version: 1.1.1
+version: 1.1.2
 icon: "https://www.vereign.com/wp-content/themes/vereign2020/images/vereign-logo.svg"
diff --git a/app b/app
new file mode 160000
index 0000000000000000000000000000000000000000..5bd23e5882cb0c2098dbc830a6e00a161add8e14
--- /dev/null
+++ b/app
@@ -0,0 +1 @@
+Subproject commit 5bd23e5882cb0c2098dbc830a6e00a161add8e14
diff --git a/values.yaml b/values.yaml
index d821cfe1d347a09149b63356ec4aa1c02eae83cf..5a36789f580b7f2770573b54070407b88e983178 100644
--- a/values.yaml
+++ b/values.yaml
@@ -8,7 +8,7 @@ nameOverride: ""
 image:
   repository: eu.gcr.io/vrgn-infra-prj
   # -- Image name
-  name: gaiax/task
+  name: tsa/task
   # -- Image tag
   # Uses .Chart.AppVersion if empty
   tag: ""