diff --git a/scripts/backend-development/docker-compose.yaml b/scripts/backend-development/docker-compose.yaml
index 2b92d6b0..65a65e73 100644
--- a/scripts/backend-development/docker-compose.yaml
+++ b/scripts/backend-development/docker-compose.yaml
@@ -9,6 +9,11 @@ services:
     environment:
       POSTGRES_USER: postgres
       POSTGRES_PASSWORD: postgres
+    healthcheck:
+      test: ["CMD", "pg_isready", "-U", "postgres"]
+      interval: 2s
+      timeout: 2s
+      retries: 10
 
   adminer:
     image: adminer
diff --git a/scripts/endtoend-demo/docker-compose.yaml b/scripts/endtoend-demo/docker-compose.yaml
index 8aa2b0fa..5e9ad9ac 100644
--- a/scripts/endtoend-demo/docker-compose.yaml
+++ b/scripts/endtoend-demo/docker-compose.yaml
@@ -3,69 +3,35 @@ version: "3.7"
 services:
   # This DB is for the FastAPI Backend.
   db:
-    image: postgres
-    restart: always
-    ports:
-      - 5432:5432
-    environment:
-      POSTGRES_USER: postgres
-      POSTGRES_PASSWORD: postgres
-    healthcheck:
-      test: ["CMD", "pg_isready", "-U", "postgres"]
-      interval: 2s
-      timeout: 2s
-      retries: 10
+    extends:
+      file: ../frontend-development/docker-compose.yaml
+      service: db
 
   # This DB is for Web Authentication and data caching.
   webdb:
-    image: postgres
-    restart: always
-    ports:
-      - 5433:5432
-    environment:
-      POSTGRES_USER: postgres
-      POSTGRES_PASSWORD: postgres
-    healthcheck:
-      test: ["CMD", "pg_isready", "-U", "postgres"]
-      interval: 2s
-      timeout: 2s
-      retries: 10
+    extends:
+      file: ../frontend-development/docker-compose.yaml
+      service: webdb
 
   # This lets you manually inspect the web and backend databases.
   adminer:
-    image: adminer
-    restart: always
-    ports:
-      - 8089:8080
+    extends:
+      file: ../frontend-development/docker-compose.yaml
+      service: adminer
 
   # This fakes an SMTP email server used by website authentication.
   # User registration emails can be found by going to localhost:1080 and
   # opening the emails listed.
   maildev:
-    image: maildev/maildev
-    restart: always
-    environment:
-      - MAILDEV_WEB_PORT=1080
-      - MAILDEV_SMTP_PORT=1025
-    ports:
-      - "1080:1080"
-      - "1025:1025"
+    extends:
+      file: ../frontend-development/docker-compose.yaml
+      service: maildev
 
   # The oassist backend service.
   backend:
-    build:
-      dockerfile: docker/Dockerfile.backend
-      context: ../../
-    image: oasst-backend
-    environment:
-      - POSTGRES_HOST=db
-      - ALLOW_ANY_API_KEY=True
-      - MAX_WORKERS=1
-    depends_on:
-      db:
-        condition: service_healthy
-    ports:
-      - "8080:8080"
+    extends:
+      file: ../frontend-development/docker-compose.yaml
+      service: backend
 
   # The oassist web service.
   web:
diff --git a/scripts/frontend-development/docker-compose.yaml b/scripts/frontend-development/docker-compose.yaml
index 99f30f62..4e08ae29 100644
--- a/scripts/frontend-development/docker-compose.yaml
+++ b/scripts/frontend-development/docker-compose.yaml
@@ -6,11 +6,6 @@ services:
     extends:
       file: ../backend-development/docker-compose.yaml
       service: db
-    healthcheck:
-      test: ["CMD", "pg_isready", "-U", "postgres"]
-      interval: 2s
-      timeout: 2s
-      retries: 10
 
   # This DB is for Web Authentication and data caching.
   webdb:
@@ -32,6 +27,7 @@ services:
     extends:
       file: ../backend-development/docker-compose.yaml
       service: adminer
+
   backend:
     build:
       dockerfile: docker/Dockerfile.backend