diff --git a/manifests/deployments/pleroma.yaml b/manifests/deployments/pleroma.yaml
index bc1804e..b6e51ca 100644
--- a/manifests/deployments/pleroma.yaml
+++ b/manifests/deployments/pleroma.yaml
@@ -95,6 +95,10 @@ spec:
                 secretKeyRef:
                   name: pleroma
                   key: default-signer
+            - name: MEDIA_URL
+              value: "https://media.darkdork.dev"
+            - name: S3_BUCKET
+              value: pleroma.darkdork.dev
             - name: S3_ACCESS_KEY
               valueFrom:
                 secretKeyRef:
@@ -105,6 +109,12 @@ spec:
                 secretKeyRef:
                   name: pleroma
                   key: minio-secret-key
+            - name: S3_SCHEME
+              value: "http://"
+            - name: S3_HOST
+              value: minio
+            - name: S3_PORT
+              value: "80"
             - name: DB_HOST
               value: postgres
             - name: DB_NAME
diff --git a/pleroma/docker.exs b/pleroma/docker.exs
index 126391e..ef4e39b 100644
--- a/pleroma/docker.exs
+++ b/pleroma/docker.exs
@@ -54,21 +54,21 @@ config :pleroma, Pleroma.Uploaders.Local, uploads: "/var/lib/pleroma/uploads"
 #
 config :pleroma, Pleroma.Upload,
  uploader: Pleroma.Uploaders.S3,
- base_url: "https://media.darkdork.dev"
+ base_url: System.get_env("MEDIA_URL")
 
 config :pleroma, Pleroma.Uploaders.S3,
-  bucket: "pleroma.darkdork.dev",
+  bucket: System.get_env("S3_BUCKET"),
   bucket_namespace: nil,
   truncated_namespace: "",
-  streaming_enabled: false
+  streaming_enabled: true
 
 # Configure S3 credentials:
 config :ex_aws, :s3,
   access_key_id: System.get_env("S3_ACCESS_KEY"),
   secret_access_key: System.get_env("S3_SECRET_KEY"),
-  scheme: "http://",
-  host: "minio",
-  port: 80
+  scheme: System.get_env("S3_SCHEME"),
+  host: System.get_env("S3_HOST"),
+  port: System.get_env("S3_PORT")
 
 config :joken, default_signer: System.get_env("DEFAULT_SIGNER")