diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index d99c29999..1d1d10c8a 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -28,8 +28,8 @@ jobs:
         export COMPOSE_DOCKER_CLI_BUILD=1
         export BUILDKIT_PROGRESS=plain
         docker pull composer:2.0
-        docker compose -f docker-compose.yml -f docker-compose.ci.yml build appwrite
-        docker compose -f docker-compose.yml -f docker-compose.ci.yml up -d
+        docker compose build appwrite
+        docker compose up -d
         sleep 30
     - name: Doctor
       run: docker compose exec -T appwrite doctor
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 1e3c4ce91..5757b1c6c 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -93,6 +93,7 @@ git clone git@github.com:[YOUR_FORK_HERE]/appwrite.git
 
 cd appwrite
 
+docker compose build
 docker compose up -d
 ```
 
diff --git a/docker-compose.ci.yml b/docker-compose.ci.yml
deleted file mode 100644
index 21d5e5d29..000000000
--- a/docker-compose.ci.yml
+++ /dev/null
@@ -1,48 +0,0 @@
-services:
-  appwrite:
-    image: appwrite-dev
-
-  appwrite-realtime:
-    image: appwrite-dev
-
-  appwrite-worker-audits:
-    image: appwrite-dev
-
-  appwrite-worker-webhooks:
-    image: appwrite-dev
-
-  appwrite-worker-deletes:
-    image: appwrite-dev
-
-  appwrite-worker-databases:
-    image: appwrite-dev
-
-  appwrite-worker-builds:
-    image: appwrite-dev
-
-  appwrite-worker-certificates:
-    image: appwrite-dev
-
-  appwrite-worker-functions:
-    image: appwrite-dev
-
-  appwrite-executor:
-    image: appwrite-dev
-
-  appwrite-worker-mails:
-    image: appwrite-dev
-
-  appwrite-worker-messaging:
-    image: appwrite-dev
-
-  appwrite-maintenance:
-    image: appwrite-dev
-
-  appwrite-usage-timeseries:
-    image: appwrite-dev
-
-  appwrite-usage-database:
-    image: appwrite-dev
-
-  appwrite-schedule:
-    image: appwrite-dev
diff --git a/docker-compose.yml b/docker-compose.yml
index 6ab2353e3..e69c14282 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -70,6 +70,7 @@ services:
   appwrite:
     container_name: appwrite
     <<: *x-logging
+    image: appwrite-dev
     build:
       context: .
       args:
@@ -181,8 +182,7 @@ services:
     entrypoint: realtime
     <<: *x-logging
     container_name: appwrite-realtime
-    build:
-      context: .
+    image: appwrite-dev
     restart: unless-stopped
     ports: 
       - 9505:80
@@ -229,8 +229,7 @@ services:
     entrypoint: worker-audits
     <<: *x-logging
     container_name: appwrite-worker-audits
-    build:
-      context: .
+    image: appwrite-dev
     networks:
       - appwrite
     volumes:
@@ -258,8 +257,7 @@ services:
     entrypoint: worker-webhooks
     <<: *x-logging
     container_name: appwrite-worker-webhooks
-    build:
-      context: .
+    image: appwrite-dev
     networks:
       - appwrite
     volumes:
@@ -284,8 +282,7 @@ services:
     entrypoint: worker-deletes
     <<: *x-logging
     container_name: appwrite-worker-deletes
-    build:
-      context: .
+    image: appwrite-dev
     networks:
       - appwrite
     depends_on:
@@ -321,8 +318,7 @@ services:
     entrypoint: worker-databases
     <<: *x-logging
     container_name: appwrite-worker-databases
-    build:
-      context: .
+    image: appwrite-dev
     networks:
       - appwrite
     volumes: 
@@ -351,8 +347,7 @@ services:
     entrypoint: worker-builds
     <<: *x-logging
     container_name: appwrite-worker-builds
-    build:
-      context: .
+    image: appwrite-dev
     networks:
       - appwrite
     volumes: 
@@ -382,8 +377,7 @@ services:
     entrypoint: worker-certificates
     <<: *x-logging
     container_name: appwrite-worker-certificates
-    build:
-      context: .
+    image: appwrite-dev
     networks:
       - appwrite
     depends_on:
@@ -416,8 +410,7 @@ services:
     entrypoint: worker-functions
     <<: *x-logging
     container_name: appwrite-worker-functions
-    build:
-      context: .
+    image: appwrite-dev
     networks:
       - appwrite
     volumes:
@@ -451,12 +444,7 @@ services:
     <<: *x-logging
     entrypoint: executor
     stop_signal: SIGINT
-    build:
-      context: .
-      args: 
-        - DEBUG=false
-        - TESTING=true
-        - VERSION=dev
+    image: appwrite-dev
     networks:
       appwrite:
       runtimes:
@@ -496,8 +484,7 @@ services:
     entrypoint: worker-mails
     <<: *x-logging
     container_name: appwrite-worker-mails
-    build:
-      context: .
+    image: appwrite-dev
     networks:
       - appwrite
     volumes:
@@ -528,8 +515,7 @@ services:
     entrypoint: worker-messaging
     <<: *x-logging
     container_name: appwrite-worker-messaging
-    build:
-      context: .
+    image: appwrite-dev
     networks:
       - appwrite
     volumes:
@@ -552,8 +538,7 @@ services:
     entrypoint: maintenance
     <<: *x-logging
     container_name: appwrite-maintenance
-    build:
-      context: .
+    image: appwrite-dev
     networks:
       - appwrite
     volumes:
@@ -588,10 +573,7 @@ services:
       - --type=timeseries
     <<: *x-logging
     container_name: appwrite-usage-timeseries
-    build:
-      context: .
-      args:
-        - DEBUG=false
+    image: appwrite-dev
     networks:
       - appwrite
     volumes:
@@ -626,10 +608,7 @@ services:
       - --type=database
     <<: *x-logging
     container_name: appwrite-usage-database
-    build:
-      context: .
-      args:
-        - DEBUG=false
+    image: appwrite-dev
     networks:
       - appwrite
     volumes:
@@ -662,8 +641,7 @@ services:
     entrypoint: schedule
     <<: *x-logging
     container_name: appwrite-schedule
-    build:
-      context: .
+    image: appwrite-dev
     networks:
       - appwrite
     volumes: