diff --git a/.gitattributes b/.gitattributes
index 710ca1f..02bfd9f 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -8,3 +8,4 @@ ddclient/ddclient.conf filter=git-crypt diff=git-crypt
 htpasswd filter=git-crypt diff=git-crypt
 id_rsa filter=git-crypt diff=git-crypt
 .env filter=git-crypt diff=git-crypt
+garage.toml filter=git-crypt diff=git-crypt
diff --git a/README.md b/README.md
index 0bf32ee..ba7ed11 100644
--- a/README.md
+++ b/README.md
@@ -62,6 +62,37 @@ To backup the named volumes, run:
 ./backup.py
 ```
 
+## Garage
+
+### Utils
+
+```bash
+garage status
+garage bucket list
+garage help
+```
+
+### Create a new bucket
+
+```bash
+garage bucket create test
+garage bucket info test
+```
+
+### Create new key
+
+```bash
+garage key create test-app-key
+garage key list
+garage key info test-app-key
+```
+
+### Add key to bucket
+
+```bash
+garage bucket allow --read --write --owner test --key test-app-key
+```
+
 ## Logs
 
     2022-11-02 Created OVH token
diff --git a/docker-compose.yml b/docker-compose.yml
index 399ce90..34eca75 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -439,13 +439,28 @@ services:
       VIKUNJA_MAILER_PASSWORD: ${MAIL_PASSWORD}
       VIKUNJA_MAILER_FORCESSL: ${MAIL_USE_SSL}
       VIKUNJA_SERVICE_ENABLEREGISTRATION: false
-
-
     volumes:
       - vikunja-data:/app/vikunja/files
       - vikunja-db:/db
 
 
+  garage:
+    image: dxflrs/garage:v2.1.0
+    container_name: garage
+    restart: unless-stopped
+    environment:
+      <<: *common-environment
+    volumes:
+      - ./garage/garage.toml:/etc/garage.toml
+      - garage-meta:/meta
+      - ./data/garage-data:/data
+    ports:
+      - 3900:3900
+      - 3901:3901
+      - 3902:3902
+      - 3903:3903
+
+
 volumes:
   money-data:
   lychee-db:
@@ -475,6 +490,7 @@ volumes:
   taskchampion-data:
   vikunja-data:
   vikunja-db:
+  garage-meta:
 
 
 secrets: