diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 321d5559..52f8ffd6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -2,10 +2,10 @@ include:
   - local: 'ci_templates/.cic-template.yml'
   - local: 'apps/contract-migration/.gitlab-ci.yml'
   - local: 'apps/cic-eth/.gitlab-ci.yml'
-  # - local: 'apps/cic-ussd/.gitlab-ci.yml'
-  # - local: 'apps/cic-notify/.gitlab-ci.yml'
-  # - local: 'apps/cic-meta/.gitlab-ci.yml'
-  # - local: 'apps/cic-cache/.gitlab-ci.yml'
+  - local: 'apps/cic-ussd/.gitlab-ci.yml'
+  - local: 'apps/cic-notify/.gitlab-ci.yml'
+  - local: 'apps/cic-meta/.gitlab-ci.yml'
+  - local: 'apps/cic-cache/.gitlab-ci.yml'
   - local: 'apps/data-seeding/.gitlab-ci.yml'
 
 stages:
diff --git a/apps/cic-cache/.gitlab-ci.yml b/apps/cic-cache/.gitlab-ci.yml
index 7329ec13..ce16d38b 100644
--- a/apps/cic-cache/.gitlab-ci.yml
+++ b/apps/cic-cache/.gitlab-ci.yml
@@ -2,6 +2,7 @@
     variables:
         APP_NAME: cic-cache
         DOCKERFILE_PATH: $APP_NAME/docker/Dockerfile
+        CONTEXT: apps
 
 build-mr-cic-cache:
     extends:
diff --git a/apps/cic-eth/.gitlab-ci.yml b/apps/cic-eth/.gitlab-ci.yml
index ef2b02ce..188f0e42 100644
--- a/apps/cic-eth/.gitlab-ci.yml
+++ b/apps/cic-eth/.gitlab-ci.yml
@@ -2,7 +2,7 @@
     variables:
         APP_NAME: cic-eth
         DOCKERFILE_PATH: docker/Dockerfile_ci
-        CONTEXT: $CI_PROJECT_DIR/apps/$APP_NAME
+        CONTEXT: apps/$APP_NAME
 
 build-mr-cic-eth:
     extends:
diff --git a/apps/cic-meta/.gitlab-ci.yml b/apps/cic-meta/.gitlab-ci.yml
index 7aac4f90..85c33ad5 100644
--- a/apps/cic-meta/.gitlab-ci.yml
+++ b/apps/cic-meta/.gitlab-ci.yml
@@ -3,7 +3,7 @@
     variables:
         APP_NAME: cic-meta
         DOCKERFILE_PATH: $APP_NAME/docker/Dockerfile
-        IMAGE_TAG: $CI_REGISTRY_IMAGE/$APP_NAME:unittest-$CI_COMMIT_SHORT_SHA
+        CONTEXT: apps
 
 build-mr-cic-meta:
     extends:
diff --git a/apps/cic-notify/.gitlab-ci.yml b/apps/cic-notify/.gitlab-ci.yml
index 153f0d47..73d3bf14 100644
--- a/apps/cic-notify/.gitlab-ci.yml
+++ b/apps/cic-notify/.gitlab-ci.yml
@@ -2,6 +2,7 @@
     variables:
         APP_NAME: cic-notify
         DOCKERFILE_PATH: $APP_NAME/docker/Dockerfile
+        CONTEXT: apps/
 
 build-mr-cic-notify:
     extends:
diff --git a/apps/cic-ussd/.gitlab-ci.yml b/apps/cic-ussd/.gitlab-ci.yml
index 99ad5e29..f020ec2d 100644
--- a/apps/cic-ussd/.gitlab-ci.yml
+++ b/apps/cic-ussd/.gitlab-ci.yml
@@ -2,6 +2,7 @@
     variables:
         APP_NAME: cic-ussd
         DOCKERFILE_PATH: $APP_NAME/docker/Dockerfile
+        CONTEXT: apps/
 
 build-mr-cic-ussd:
     extends:
diff --git a/apps/contract-migration/.gitlab-ci.yml b/apps/contract-migration/.gitlab-ci.yml
index 14f12262..d48f7933 100644
--- a/apps/contract-migration/.gitlab-ci.yml
+++ b/apps/contract-migration/.gitlab-ci.yml
@@ -1,8 +1,8 @@
 .contract_migration_variables:
     variables:
         APP_NAME: contract-migration
-        DOCKERFILE_PATH: $APP_NAME/docker/Dockerfile_ci
-        CONTEXT: $CI_PROJECT_DIR/apps/$APP_NAME
+        DOCKERFILE_PATH: docker/Dockerfile_ci
+        CONTEXT: apps/$APP_NAME
 
 build-mr-contract-migration:
     extends:
diff --git a/apps/data-seeding/.gitlab-ci.yml b/apps/data-seeding/.gitlab-ci.yml
index eebf7a47..1554b922 100644
--- a/apps/data-seeding/.gitlab-ci.yml
+++ b/apps/data-seeding/.gitlab-ci.yml
@@ -1,7 +1,8 @@
 .data_seeding_variables:
     variables:
         APP_NAME: data-seeding
-        DOCKERFILE_PATH: $APP_NAME/docker/Dockerfile_ci
+        DOCKERFILE_PATH: docker/Dockerfile_ci
+        CONTEXT: apps/$APP_NAME
 
 build-mr-data-seeding:
     extends: