diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8efce09..726bacb 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -217,6 +217,22 @@ build-competition:
     BUILDTARGET: runtime
     SERVICE_NAME: competition
 
+build-task:
+  <<: *build-config
+  variables:
+    IMAGE_NAME: $BASE_IMAGE_NAME/task
+    CONTAINERFILE: Containerfile
+    BUILDTARGET: runtime
+    SERVICE_NAME: task
+
+build-user:
+  <<: *build-config
+  variables:
+    IMAGE_NAME: $BASE_IMAGE_NAME/user
+    CONTAINERFILE: Containerfile
+    BUILDTARGET: runtime
+    SERVICE_NAME: user
+
 golangci-lint:
   stage: lint
   image: docker.io/golangci/golangci-lint:latest-alpine
@@ -297,6 +313,22 @@ sast-image-competition:
   dependencies:
     - build-competition
 
+sast-image-task:
+  <<: *trivy-image-scan
+  variables:
+    IMAGE_NAME: $BASE_IMAGE_NAME/task
+    IMAGE_TYPE: task
+  dependencies:
+    - build-task
+
+sast-image-user:
+  <<: *trivy-image-scan
+  variables:
+    IMAGE_NAME: $BASE_IMAGE_NAME/user
+    IMAGE_TYPE: user
+  dependencies:
+    - build-user
+
 tag-migrate:
   <<: *tag-config
   variables:
@@ -317,6 +349,16 @@ tag-competition:
   variables:
     IMAGE_NAME: $BASE_IMAGE_NAME/competition
 
+tag-task:
+  <<: *tag-config
+  variables:
+    IMAGE_NAME: $BASE_IMAGE_NAME/task
+
+tag-user:
+  <<: *tag-config
+  variables:
+    IMAGE_NAME: $BASE_IMAGE_NAME/user
+
 # webhook-backend-deploy:
 #   <<: *webhook-config
 #   stage: deploy