diff --git a/README.md b/README.md
index fe2832b3..33baae30 100644
--- a/README.md
+++ b/README.md
@@ -43,6 +43,8 @@
 | fastenhealth | ghcr.io/fastenhealth/fasten-onprem:main |
 | flaresolverr | ghcr.io/flaresolverr/flaresolverr:latest |
 | freescout | tiredofit/freescout:latest |
+| garage | dxflrs/garage:v2.0.0 |
+| garage-webui | khairul169/garage-webui:latest |
 | ghost | ghost:latest |
 | gitea | gitea/gitea:1.24.0 |
 | gitea-db | postgres:14 |
diff --git a/docker-compose.yml b/docker-compose.yml
index 9a9c88aa..83b3080b 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1464,6 +1464,40 @@ services:
       - ${DOCKER_VOLUME_CONFIG}/freescout/assets/custom-scripts:/assets/custom-scripts
       - ${DOCKER_VOLUME_CONFIG}/freescout/data:/www/html
       - ${DOCKER_VOLUME_CONFIG}/freescout/logs/:/www/logs
+  garage:
+    container_name: garage
+    image: dxflrs/garage:v2.0.0
+    ports:
+      - 3900:3900
+      - 3901:3901
+      - 3902:3902
+      - 3903:3903
+    restart: unless-stopped
+    volumes:
+      - ${DOCKER_VOLUME_CONFIG}/garage/garage.toml:/etc/garage.toml
+      - ${DOCKER_VOLUME_CONFIG}/garage/meta:/var/lib/garage/meta
+      - ${DOCKER_STORAGE_CONFIG}/garage_data:/var/lib/garage/data
+  garage-webui:
+    container_name: garage-webui
+    depends_on:
+      garage:
+        condition: service_started
+        required: true
+    environment:
+      API_BASE_URL: http://garage:3903
+      S3_ENDPOINT_URL: http://garage:3900
+    image: khairul169/garage-webui:latest
+    labels:
+      homepage.group: System Administration
+      homepage.name: Garage
+      homepage.href: http://192.168.1.254:3909
+      homepage.icon: garage.svg
+      homepage.description: S3-compatible storage backend
+    ports:
+      - 3909:3909
+    restart: unless-stopped
+    volumes:
+      - ${DOCKER_VOLUME_CONFIG}/garage/garage.toml:/etc/garage.toml:ro
   ghost:
     container_name: ghost_blog
     depends_on: