diff --git a/docker-compose.build-m1.yaml b/docker-compose.build-m1.yaml
index 71e8dc4f6d5e..142a85c9efe5 100644
--- a/docker-compose.build-m1.yaml
+++ b/docker-compose.build-m1.yaml
@@ -14,7 +14,7 @@ services:
     image: airbyte/init:${VERSION}
     build:
       dockerfile: Dockerfile
-      context: airbyte-config/init
+      context: airbyte-config/init/build/docker
       labels:
         io.airbyte.git-revision: ${GIT_REVISION}
   db:
@@ -22,7 +22,7 @@ services:
     image: airbyte/db:${VERSION}
     build:
       dockerfile: Dockerfile
-      context: airbyte-db/lib
+      context: airbyte-db/lib/build/docker
       labels:
         io.airbyte.git-revision: ${GIT_REVISION}
   scheduler:
@@ -32,7 +32,7 @@ services:
       dockerfile: Dockerfile
       args:
         JDK_VERSION: ${JDK_VERSION}
-      context: airbyte-scheduler/app
+      context: airbyte-scheduler/app/build/docker
       labels:
         io.airbyte.git-revision: ${GIT_REVISION}
   worker:
@@ -43,7 +43,7 @@ services:
       args:
         ARCH: ${DOCKER_BUILD_ARCH}
         JDK_VERSION: ${JDK_VERSION}
-      context: airbyte-workers
+      context: airbyte-workers/build/docker
       labels:
         io.airbyte.git-revision: ${GIT_REVISION}
   server:
@@ -53,7 +53,7 @@ services:
       dockerfile: Dockerfile
       args:
         JDK_VERSION: ${JDK_VERSION}
-      context: airbyte-server
+      context: airbyte-server/build/docker
       labels:
         io.airbyte.git-revision: ${GIT_REVISION}
   webapp:
@@ -61,7 +61,7 @@ services:
     image: airbyte/webapp:${VERSION}
     build:
       dockerfile: Dockerfile
-      context: airbyte-webapp
+      context: airbyte-webapp/build/docker
       labels:
         io.airbyte.git-revision: ${GIT_REVISION}
   migration:
@@ -71,6 +71,6 @@ services:
       dockerfile: Dockerfile
       args:
         JDK_VERSION: ${JDK_VERSION}
-      context: airbyte-migration
+      context: airbyte-migration/build/docker
       labels:
         io.airbyte.git-revision: ${GIT_REVISION}
diff --git a/docker-compose.build.yaml b/docker-compose.build.yaml
index bce29f9bbb07..de1a6cfcc613 100644
--- a/docker-compose.build.yaml
+++ b/docker-compose.build.yaml
@@ -5,48 +5,48 @@ services:
     image: airbyte/init:${VERSION}
     build:
       dockerfile: Dockerfile
-      context: airbyte-config/init
+      context: airbyte-config/init/build/docker
       labels:
         io.airbyte.git-revision: ${GIT_REVISION}
   db:
     image: airbyte/db:${VERSION}
     build:
       dockerfile: Dockerfile
-      context: airbyte-db/lib
+      context: airbyte-db/lib/build/docker
       labels:
         io.airbyte.git-revision: ${GIT_REVISION}
   scheduler:
     image: airbyte/scheduler:${VERSION}
     build:
       dockerfile: Dockerfile
-      context: airbyte-scheduler/app
+      context: airbyte-scheduler/app/build/docker
       labels:
         io.airbyte.git-revision: ${GIT_REVISION}
   worker:
     image: airbyte/worker:${VERSION}
     build:
       dockerfile: Dockerfile
-      context: airbyte-workers
+      context: airbyte-workers/build/docker
       labels:
         io.airbyte.git-revision: ${GIT_REVISION}
   server:
     image: airbyte/server:${VERSION}
     build:
       dockerfile: Dockerfile
-      context: airbyte-server
+      context: airbyte-server/build/docker
       labels:
         io.airbyte.git-revision: ${GIT_REVISION}
   webapp:
     image: airbyte/webapp:${VERSION}
     build:
       dockerfile: Dockerfile
-      context: airbyte-webapp
+      context: airbyte-webapp/build/docker
       labels:
         io.airbyte.git-revision: ${GIT_REVISION}
   migration:
     image: airbyte/migration:${VERSION}
     build:
       dockerfile: Dockerfile
-      context: airbyte-migration
+      context: airbyte-migration/build/docker
       labels:
         io.airbyte.git-revision: ${GIT_REVISION}