diff --git a/docker-compose.yml b/docker-compose.yml
index f978375d..fb3d5ab1 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -2022,7 +2022,7 @@ services:
       -c wal_compression=on
     container_name: immich-pg-db
     environment:
-      POSTGRES_PASSWORD: ${JOPLIN_POSTGRES_PASSWORD}
+      POSTGRES_PASSWORD: ${IMMICH_DB_PASSWORD}
       POSTGRES_USER: immich
       POSTGRES_DB: immich
     expose:
@@ -2041,6 +2041,43 @@ services:
     restart: unless-stopped
     volumes:
       - ${DOCKER_VOLUME_CONFIG}/immich/db:/var/lib/postgresql/data
+  immich-public-proxy:
+    container_name: immich-public-proxy
+    depends_on:
+      immich-server:
+        condition: service_started
+        required: true
+    environment:
+      IMMICH_URL: http://immich-server:2283
+    expose:
+      - 3000
+    healthcheck:
+      test: wget -q --spider http://localhost:3000/share/healthcheck || exit 1
+      start_period: 10s
+      timeout: 5s
+    image: alangrainger/immich-public-proxy:latest
+    labels:
+      homepage: enable
+      homepage_proto: http
+      homepage_port: 3000
+      homepage_url: pics.${MY_TLD}
+      homepage.uptime-kuma.enabled: true
+      homepage.uptime-kuma.monitor.url: https://pics.${MY_TLD}
+      homepage.group: Lifestyle
+      homepage.name: Immich
+      homepage.href: https://pics.${MY_TLD}
+      homepage.icon: immich.svg
+      homepage.description: High performance self-hosted photo and video management solution
+    restart: always
+  immich-power-tools:
+    container_name: immich-power-tools
+    environment:
+      IMMICH_API_KEY: ${}
+      IMMICH_URL: http://immich-server:2283
+      EXTERNAL_IMMICH_URL: https://pics.trez.wtf
+    image: ghcr.io/varun-raj/immich-power-tools:latest
+    ports:
+      - 54018:3000
   influxdb2:
     container_name: influxdb2
     environment: