diff --git a/.env.example b/.env.example
index 5fd859b352f20e8202e815ed711204e278391e2c..a57ec8013081be68cd38174734c6ac576a6f4082 100644
--- a/.env.example
+++ b/.env.example
@@ -41,3 +41,19 @@ NGINX_DOCKER_IMG=registry.gitlab.e.foundation/e/infra/ecloud/nextcloud/nginx:lat
 # syslog
 SYSLOG_HOST=syslog
 
+# S3 Bucket Configuration
+OBJECTSTORE_S3_BUCKET=
+OBJECTSTORE_S3_REGION=main
+OBJECTSTORE_S3_HOST=fsn1.your-objectstorage.com
+OBJECTSTORE_S3_PORT=443
+
+# S3 Credentials (sensitive - keep secure)
+OBJECTSTORE_S3_KEY=your_access_key_here
+OBJECTSTORE_S3_SECRET=your_secret_key_here
+
+# S3 Connection Settings
+OBJECTSTORE_S3_SSL=true
+OBJECTSTORE_S3_USEPATH_STYLE=true
+
+OBJECTSTORE_S3_AUTOCREATE=
+OBJECTSTORE_S3_OBJECT_PREFIX=
diff --git a/.gitignore b/.gitignore
index 986991d23b03ef968e843f16de2e9ae5008eec70..d6588b0eb1266a2c365264c0ca12c307894d9025 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,2 @@
 .idea
 files
-.env
-troubleshoot/
diff --git a/docker-compose.yml b/docker-compose.yml
index 5c0b2444871bb25ae3377399829472b7317b2f8c..5afbcf51c480bfa576fd0601113d2c9cc0b336ce 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,6 +22,17 @@ services:
       - SYSLOG_HOST=${SYSLOG_HOST}
       - SENTRY_DSN=${SENTRY_DSN}
       - SENTRY_PUBLIC_DSN=${SENTRY_PUBLIC_DSN}
+      # Object Storage (S3) configuration
+      - OBJECTSTORE_S3_BUCKET=${OBJECTSTORE_S3_BUCKET}
+      - OBJECTSTORE_S3_REGION=${OBJECTSTORE_S3_REGION}
+      - OBJECTSTORE_S3_HOST=${OBJECTSTORE_S3_HOST}
+      - OBJECTSTORE_S3_PORT=${OBJECTSTORE_S3_PORT}
+      - OBJECTSTORE_S3_KEY=${OBJECTSTORE_S3_KEY}
+      - OBJECTSTORE_S3_SECRET=${OBJECTSTORE_S3_SECRET}
+      - OBJECTSTORE_S3_SSL=${OBJECTSTORE_S3_SSL}
+      - OBJECTSTORE_S3_USEPATH_STYLE=${OBJECTSTORE_S3_USEPATH_STYLE}
+      - OBJECTSTORE_S3_OBJECT_PREFIX=${OBJECTSTORE_S3_OBJECT_PREFIX}
+      - OBJECTSTORE_S3_AUTOCREATE=${OBJECTSTORE_S3_AUTOCREATE}
     volumes:
       - nextcloud-config:/var/www/html/config
       - nextcloud-data:/var/www/html/data