diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0183ead..596334a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -5,7 +5,7 @@ services:
 
 variables:
   DOCKER_TLS_CERTDIR: ""
-
+  GIT_DEPTH: "1"
 stages:
   - setup:dev
   - build:dev
diff --git a/docker-compose.yaml b/docker-compose.yaml
index b11277c..3b52f28 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -66,7 +66,7 @@ services:
       target: dev
       dockerfile: cmd/web-app/Dockerfile
       args:
-        service: 'web-app'
+        name: 'web-app'
     volumes:
       - ./:/go/src/gitlab.com/geeks-accelerator/oss/saas-starter-kit
     ports:
@@ -76,6 +76,10 @@ services:
       main:
         aliases:
           - web-app
+    depends_on:
+      - postgres
+      - redis
+      - datadog
     env_file:
       - configs/.env_docker_compose
     environment:
@@ -101,7 +105,7 @@ services:
       target: dev
       dockerfile: cmd/web-api/Dockerfile
       args:
-        service: 'web-api'
+        name: 'web-api'
     volumes:
       - ./:/go/src/gitlab.com/geeks-accelerator/oss/saas-starter-kit
     ports:
@@ -111,6 +115,10 @@ services:
       main:
         aliases:
           - web-api
+    depends_on:
+      - postgres
+      - redis
+      - datadog
     env_file:
       - configs/.env_docker_compose
     environment: