diff --git a/docker-compose.yml b/docker-compose.yml
index 34eca75..5133299 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -454,11 +454,93 @@ services:
       - ./garage/garage.toml:/etc/garage.toml
       - garage-meta:/meta
       - ./data/garage-data:/data
+    ports: # TODO: Remove?
+      - 3900:3900 #s3_api
+      - 3901:3901 #rpc
+      - 3902:3902 #s3_web
+      - 3903:3903 #k2v_api
+
+
+  ente-db:
+    image: postgres:15
+    container_name: ente-db
+    restart: unless-stopped
+    environment:
+      <<: *common-environment
+      POSTGRES_DB: ente_db
+      POSTGRES_USER: pguser
+      POSTGRES_PASSWORD_FILE: /run/secrets/ente-db-pw
+    healthcheck:
+      test: pg_isready -q -d ente_db -U pguser
+      start_period: 40s
+      start_interval: 1s
+    volumes:
+      - ente-db:/var/lib/postgresql/data
+    secrets:
+      - ente-db-pw
+
+
+  ente-server: # named "museum" in the doc
+    image: ghcr.io/ente-io/server
+    container_name: ente-server
+    restart: unless-stopped
     ports:
-      - 3900:3900
-      - 3901:3901
-      - 3902:3902
-      - 3903:3903
+      - 8080:8080 # API
+    depends_on:
+      ente-db:
+        condition: service_healthy
+    environment:
+      <<: *common-environment
+      ENTE_DB_HOST: ente-db
+      ENTE_DB_NAME: ente_db
+      ENTE_DB_USER: pguser
+      ENTE_S3_B2_EU_CEN_ENDPOINT: garage:3900
+      ENTE_S3_B2_EU_CEN_REGION: garage
+      ENTE_S3_B2_EU_CEN_BUCKET: ente
+      ENTE_APPS_PUBLIC_ALBUMS: http://dm:3002
+      ENTE_APPS_CAST: http://dm:3004
+      ENTE_APPS_EMBED_ALBUMS: http://dm:3005
+      ENTE_APPS_ACCOUNTS: http://dm:3001
+    secrets:
+      - ente-db-pw
+      - ente-s3-key
+      - ente-s3-secret
+#    volumes:
+#      - ./ente/config.yaml:/museum.yaml:ro
+    command: >
+      sh -c "
+      export ENTE_DB_PASSWORD=$(cat /run/secrets/ente-db-pw);
+      export ENTE_S3_B2_EU_CEN_KEY=$(cat /run/secrets/ente-s3-key | xargs);
+      export ENTE_S3_B2_EU_CEN_SECRET=$(cat /run/secrets/ente-s3-secret | xargs);
+      exec /museum
+      " 
+    healthcheck:
+      test: ["CMD", "wget", "--quiet", "--tries=1", "--spider", "http://localhost:8080/ping"]
+      interval: 60s
+      timeout: 5s
+      retries: 3
+      start_period: 120s
+
+
+  ente-web:
+    image: ghcr.io/ente-io/web
+    container_name: ente-web
+    restart: unless-stopped
+    # Uncomment what you need to tweak.
+    ports:
+      - 3000:3000 # Photos web app
+      - 3001:3001 # Accounts
+      - 3002:3002 # Public albums
+      - 3003:3003 # Auth
+      - 3004:3004 # Cast
+      - 3005:3005 # Share
+      - 3006:3006 # Embed
+    # Modify these values to your custom subdomains, if using any
+    environment:
+      <<: *common-environment
+      ENTE_API_ORIGIN: http://localhost:8080
+      ENTE_ALBUMS_ORIGIN: https://dm:3002
+      ENTE_PHOTOS_ORIGIN: http://dm:3000
 
 
 volumes:
@@ -491,6 +573,7 @@ volumes:
   vikunja-data:
   vikunja-db:
   garage-meta:
+  ente-db:
 
 
 secrets:
@@ -520,3 +603,9 @@ secrets:
     file: nocodb-db-pw.secret
   nocodb-json:
     file: nocodb-json.secret
+  ente-db-pw:
+    file: ente-db-pw.secret
+  ente-s3-key:
+    file: ente-s3-key.secret
+  ente-s3-secret:
+    file: ente-s3-secret.secret
diff --git a/ente-db-pw.secret b/ente-db-pw.secret
new file mode 100644
index 0000000..51efb0b
Binary files /dev/null and b/ente-db-pw.secret differ
diff --git a/ente-s3-key.secret b/ente-s3-key.secret
new file mode 100644
index 0000000..b5119c6
Binary files /dev/null and b/ente-s3-key.secret differ
diff --git a/ente-s3-secret.secret b/ente-s3-secret.secret
new file mode 100644
index 0000000..3933004
Binary files /dev/null and b/ente-s3-secret.secret differ