diff --git a/PostFundManagement.Api/appsettings.json b/PostFundManagement.Api/appsettings.json
index f81911d..5e805f2 100644
--- a/PostFundManagement.Api/appsettings.json
+++ b/PostFundManagement.Api/appsettings.json
@@ -19,7 +19,7 @@
   },
   "Monitoring": {
     "Address": "http://aspire-dashboard-service.aspire.svc.cluster.local:18889",
-    "ServiceName": "MidrandBooks.DEV"
+    "ServiceName": "Pfm.DEV"
   },
   "SecuritySettings": {
     "Authority": "https://sts.security.khongisa.co.za",
diff --git a/docker-compose.yml b/docker-compose.yml
index 8aa9d02..3532989 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -18,27 +18,33 @@ services:
       - ConnectionStrings__PfmDatabase=Server=${POSTGRES_HOST:-192.168.1.170};Port=${POSTGRES_PORT:-5432};Database=${POSTGRES_DB:-pfm};User Id=${POSTGRES_USER:-pfm-user};Password=${POSTGRES_PASSWORD};
       
       # Garage S3 Settings
-      - GeneralS3Settings__ServiceUrl=${GENERAL_S3_SERVICE_URL}
+      - GeneralS3Settings__ServiceUrl=${GENERAL_S3_SERVICE_URL:-http://192.168.1.177:30900}
       - GeneralS3Settings__Region=${GENERAL_S3_REGION:-garage}
-      - GeneralS3Settings__BucketName=${GENERAL_S3_BUCKET_NAME}
-      - GeneralS3Settings__CdnBaseUrl=${GENERAL_S3_CDN_BASE_URL}
+      - GeneralS3Settings__BucketName=${GENERAL_S3_BUCKET_NAME:-pfm.general}
+      - GeneralS3Settings__CdnBaseUrl=${GENERAL_S3_CDN_BASE_URL:-https://pfm.general.cdn.khongisa.co.za}
+      - GeneralS3Settings__AccessKey=${GENERAL_S3_ACCESS_KEY}
+      - GeneralS3Settings__SecretKey=${GENERAL_S3_SECRET_KEY}
 
-      - ContractS3Settings__ServiceUrl=${CONTRACT_S3_SERVICE_URL}
+      - ContractS3Settings__ServiceUrl=${CONTRACT_S3_SERVICE_URL:-http://192.168.1.177:30900}
       - ContractS3Settings__Region=${CONTRACT_S3_REGION:-garage}
-      - ContractS3Settings__BucketName=${CONTRACT_S3_BUCKET_NAME}
-      - ContractS3Settings__CdnBaseUrl=${CONTRACT_S3_CDN_BASE_URL}
+      - ContractS3Settings__BucketName=${CONTRACT_S3_BUCKET_NAME:-pfm.contract}
+      - ContractS3Settings__CdnBaseUrl=${CONTRACT_S3_CDN_BASE_URL:-https://pfm.contract.cdn.khongisa.co.za}
+      - ContractS3Settings__AccessKey=${CONTRACT_S3_ACCESS_KEY}
+      - ContractS3Settings__SecretKey=${CONTRACT_S3_SECRET_KEY}
 
-      - EvidenceS3Settings__ServiceUrl=${EVIDENCE_S3_SERVICE_URL}
+      - EvidenceS3Settings__ServiceUrl=${EVIDENCE_S3_SERVICE_URL:-http://192.168.1.177:30900}
       - EvidenceS3Settings__Region=${EVIDENCE_S3_REGION:-garage}
-      - EvidenceS3Settings__BucketName=${EVIDENCE_S3_BUCKET_NAME}
-      - EvidenceS3Settings__CdnBaseUrl=${EVIDENCE_S3_CDN_BASE_URL}
+      - EvidenceS3Settings__BucketName=${EVIDENCE_S3_BUCKET_NAME:-pfm.evidence}
+      - EvidenceS3Settings__CdnBaseUrl=${EVIDENCE_S3_CDN_BASE_URL:-https://pfm.evidence.cdn.khongisa.co.za  }
+      - EvidenceS3Settings__AccessKey=${EVIDENCE_S3_ACCESS_KEY}
+      - EvidenceS3Settings__SecretKey=${EVIDENCE_S3_SECRET_KEY}
       
       # HashIds overrides
-      - HasherSettings__MinHashLength=${HASHER_MIN_HASH_LENGTH}
+      - HasherSettings__MinHashLength=${HASHER_MIN_HASH_LENGTH:-11}
       - HasherSettings__Salt=${HASHER_SALT}
 
       # Skoruba Duende Security Overrides
-      - SecuritySettings__Authority=${SECURITY_AUTHORITY}
+      - SecuritySettings__Authority=${SECURITY_AUTHORITY:-https://sts.security.khongisa.co.za}
       - SecuritySettings__Audience=${SECURITY_AUDIENCE}
       - SecuritySettings__ClientId=${SECURITY_CLIENT_ID}
       - SecuritySettings__ClientSecret=${SECURITY_CLIENT_SECRET}
@@ -48,8 +54,8 @@ services:
       - DataProtection__Password=${DATA_PROTECTION_CERTIFICATE_PASSWORD}
 
       # Monitoring Overrides
-      - Monitoring__Address=${MONITORING_ADDRESS}
-      - Monitoring__ServiceName=${MONITORING_SERVICE_NAME}
+      - Monitoring__Address=${MONITORING_ADDRESS:-http://aspire-dashboard-service.aspire.svc.cluster.local:18889}
+      - Monitoring__ServiceName=${MONITORING_SERVICE_NAME:-Pfm.DEV}
       - Monitoring__ApiKey=${MONITORING_API_KEY}
 
       # Email Processor Overrides
@@ -57,4 +63,4 @@ services:
       - Email__Credentials__Password=${EMAIL_CREDENTIALS_PASSWORD}
       - Email__Credentials__Username=${EMAIL_CREDENTIALS_USERNAME}
       - Email__SmtpServer=${EMAIL_SMTP_SERVER}
-      - Email__SmtpPort=${EMAIL_SMTP_PORT}
\ No newline at end of file
+      - Email__SmtpPort=${EMAIL_SMTP_PORT:-587}
\ No newline at end of file