diff --git a/docker-stacks/app-server/semaphore.yml b/docker-stacks/app-server/semaphore.yml
index fd6dabf..02aedbe 100644
--- a/docker-stacks/app-server/semaphore.yml
+++ b/docker-stacks/app-server/semaphore.yml
@@ -6,19 +6,22 @@ services:
     ports:
       - "{PORT}:3000"
     environment:
-      SEMAPHORE_DB_USER: {SEMAPHORE_DB_USER}
-      SEMAPHORE_DB_PASS: {SEMAPHORE_PASSWORD}
-      SEMAPHORE_DB_HOST: {SEMAPHORE_DB_HOST}
-      SEMAPHORE_DB_PORT: 5432
-      SEMAPHORE_DB_DIALECT: postgres
-      SEMAPHORE_DB: {SEMAPHORE_DB_NAME}
+      # Database Connection (External)
+      SEMAPHORE_DB_USER: "{SEMAPHORE_DB_USER}"
+      SEMAPHORE_DB_PASS: "{SEMAPHORE_PASSWORD}"
+      SEMAPHORE_DB_HOST: "{SEMAPHORE_DB_HOST}"
+      SEMAPHORE_DB_PORT: "5432"
+      SEMAPHORE_DB_DIALECT: "postgres"
+      SEMAPHORE_DB: "{SEMAPHORE_DB_NAME}"
       
-      SEMAPHORE_ADMIN: {SEMAPHORE_ADMIN_USERNAME}
-      SEMAPHORE_ADMIN_PASSWORD: {SEMAPHORE_ADMIN_PASSWORD}
-      SEMAPHORE_ADMIN_NAME: Administrator
-      SEMAPHORE_ADMIN_EMAIL: {SEMAPHORE_ADMIN_EMAIL}
+      # Initial Admin Setup
+      SEMAPHORE_ADMIN: "{SEMAPHORE_ADMIN_USERNAME}"
+      SEMAPHORE_ADMIN_PASSWORD: "{SEMAPHORE_ADMIN_PASSWORD}"
+      SEMAPHORE_ADMIN_NAME: "{SEMAPHORE_ADMIN_USERNAME}"
+      SEMAPHORE_ADMIN_EMAIL: "{SEMAPHORE_ADMIN_EMAIL}"
       
-      SEMAPHORE_ACCESS_KEY_ENCRYPTION: {SEMAPHORE_ACCESS_KEY_ENCRYPTION}
+      # Encryption Key (Required)
+      SEMAPHORE_ACCESS_KEY_ENCRYPTION: "{SEMAPHORE_ACCESS_KEY_ENCRYPTION}"
       
     volumes:
       - /tmp/semaphore:/tmp/semaphore