diff --git a/Revolt.toml.tmpl b/Revolt.toml.tmpl
index da1bc0f..9f4684b 100644
--- a/Revolt.toml.tmpl
+++ b/Revolt.toml.tmpl
@@ -13,7 +13,7 @@ redis = "redis://redis/"
 host = "rabbit"
 port = 5672
 username = "rabbituser"
-password = "{{ secret "rabbit_password" }}"
+password = "rabbitpass"
 
 [api]
 
@@ -36,14 +36,13 @@ authifier_shield_key = ""
 voso_legacy_token = ""
 trust_cloudflare = false
 
-{{ if eq "SECURITY_CAPTCHA_ENABLED" "true"}}
+{{ if eq (env "SECURITY_CAPTCHA_ENABLED") "true" }}
 [api.security.captcha]
-hcaptcha_key = "{{ }}"
-hcaptcha_sitekey = ""
+hcaptcha_key = "{{ secret "hcaptcha_key" }}" 
+hcaptcha_sitekey = "{{ secret "hcaptcha_sitekey" }}" 
 {{ end }}
 
 [api.workers]
-# Maximum concurrent connections (to proxy server)
 max_concurrent_connections = 50
 
 [api.users]
@@ -65,7 +64,7 @@ ack_queue = "notifications.process.ack"
 private_key = "{{ secret "private_key" }}"
 public_key = "{{ secret "public_key" }}"
 
-{{ if eq "NOTIFICATIONS_FCM_ENABLED" "true"}}
+{{ if eq (env "NOTIFICATIONS_FCM_ENABLED") "true" }}
 [pushd.fcm]
 queue = "notifications.outbound.fcm"
 key_type = ""
@@ -80,7 +79,7 @@ auth_provider_x509_cert_url = ""
 client_x509_cert_url = ""
 {{ end }}
 
-{{ if eq "NOTIFICATIONS_APN_ENABLED" "true"}}
+{{ if eq (env "NOTIFICATIONS_APN_ENABLED") "true" }}
 [pushd.apn]
 sandbox = false
 queue = "notifications.outbound.apn"
@@ -167,4 +166,4 @@ banners = 6_000_000
 emojis = 500_000
 
 [features.advanced]
-process_message_delay_limit = 5
+process_message_delay_limit = 5
\ No newline at end of file
diff --git a/compose.yml b/compose.yml
index 54b0e5a..722d20a 100644
--- a/compose.yml
+++ b/compose.yml
@@ -78,6 +78,8 @@ services:
       RABBITMQ_DEFAULT_PASS: rabbitpass
     volumes:
       - rabbit:/var/lib/rabbitmq
+    secrets:
+      - rabbit_password
     healthcheck:
       test: rabbitmq-diagnostics -q ping
       interval: 10s
@@ -264,11 +266,20 @@ services:
     image: docker.io/minio/mc
     depends_on:
       - minio
+    deploy:
+      restart_policy:
+        condition: on-failure
+        max_attempts: 5
     entrypoint: >
-      /bin/sh -c " while ! /usr/bin/mc ready minio; do
+      /bin/sh -c " if /usr/bin/mc ready minio; then
         /usr/bin/mc config host add minio http://minio:9000 minioautumn minioautumn;
-        echo 'Waiting minio...' && sleep 1;
-      done; /usr/bin/mc mb minio/revolt-uploads; exit 0; "
+        /usr/bin/mc mb minio/revolt-uploads;
+        echo 'Successfully created bucket';
+        exit 0;
+      else
+        echo 'Minio not ready, will retry on next container restart';
+        exit 1;
+      fi "
     networks:
       internal: