diff --git a/agents-api/docker-compose.yml b/agents-api/docker-compose.yml
index 5bf7586ac..84aae7e7c 100644
--- a/agents-api/docker-compose.yml
+++ b/agents-api/docker-compose.yml
@@ -32,8 +32,6 @@ x--base-agents-api: &base-agents-api
   build:
     context: .
     dockerfile: Dockerfile
-  ports:
-    - "8080:8080"
 
   develop:
     watch:
@@ -55,6 +53,9 @@ services:
       - ''  # Acts as a default profile. See: https://stackoverflow.com/questions/75758174/how-to-make-profile-default-for-docker-compose
       - single-tenant
 
+    ports:
+      - "8080:8080"
+
   agents-api-multi-tenant:
     <<: *base-agents-api
     profiles:
diff --git a/llm-proxy/docker-compose.yml b/llm-proxy/docker-compose.yml
index b81f2bf17..8e9403df1 100644
--- a/llm-proxy/docker-compose.yml
+++ b/llm-proxy/docker-compose.yml
@@ -60,8 +60,6 @@ services:
     restart: unless-stopped
     volumes:
       - litellm-db-data:/var/lib/postgresql/data
-    ports:
-      - "15432:5432"
     profiles:
       - self-hosted-db
     environment:
diff --git a/scheduler/cert/.gitignore b/scheduler/cert/.gitignore
new file mode 100644
index 000000000..10aa04ab9
--- /dev/null
+++ b/scheduler/cert/.gitignore
@@ -0,0 +1,9 @@
+*.crt
+*.key
+*.pem
+*.csr
+*.pem
+*.key
+*.crt
+*.csr
+*.pem
diff --git a/scheduler/docker-compose.yml b/scheduler/docker-compose.yml
index 21cd5fab9..090b0d7be 100644
--- a/scheduler/docker-compose.yml
+++ b/scheduler/docker-compose.yml
@@ -1,43 +1,59 @@
 name: julep-scheduler
 
+x--temporal-base: &temporal-base
+  image: temporalio/auto-setup:1.25
+  hostname: temporal
+  environment:
+    - POSTGRES_PWD=${TEMPORAL_POSTGRES_PASSWORD}
+    - POSTGRES_DB=${TEMPORAL_POSTGRES_DB:-temporal}
+    - POSTGRES_SEEDS=${TEMPORAL_POSTGRES_HOST:-temporal-db}
+    - DB_HOST=${TEMPORAL_POSTGRES_HOST:-temporal-db}
+    - DB_PORT=${TEMPORAL_POSTGRES_PORT:-5432}
+    - POSTGRES_USER=${TEMPORAL_POSTGRES_USER:-temporal}
+
+    - TEMPORAL_ADDRESS=${TEMPORAL_ADDRESS:-temporal:7233}
+    - POSTGRES_TLS_ENABLED=${TEMPORAL_POSTGRES_TLS_ENABLED:-false}
+    - POSTGRES_TLS_CA_FILE=/cert/ca.crt
+    - SQL_TLS_ENABLED=${TEMPORAL_POSTGRES_TLS_ENABLED:-false}
+    - SQL_CA=/cert/ca.crt
+    - POSTGRES_TLS_DISABLE_HOST_VERIFICATION=${TEMPORAL_POSTGRES_TLS_DISABLE_HOST_VERIFICATION:-false}
+    - VISIBILITY_DBNAME=${TEMPORAL_VISIBILITY_DBNAME:-temporal_visibility}
+    - SKIP_SCHEMA_SETUP=${TEMPORAL_SKIP_SCHEMA_SETUP:-false}
+    - SKIP_DB_CREATE=${TEMPORAL_SKIP_DB_CREATE:-false}
+    - DYNAMIC_CONFIG_FILE_PATH=config/dynamicconfig/temporal-postgres.yaml
+    - DB=postgres12
+    - LOG_LEVEL=${TEMPORAL_LOG_LEVEL:-info}
+  volumes:
+    - ./dynamicconfig:/etc/temporal/config/dynamicconfig
+    - ./cert:/cert
+
 services:
-  temporal:
-    depends_on:
-      temporal-db:
-        condition: service_started
-    environment:
-      - DB=${TEMPORAL_POSTGRES_DB:-postgres12}
-      - DB_PORT=${TEMPORAL_POSTGRES_PORT:-5432}
-      - DB_HOST=${TEMPORAL_POSTGRES_HOST:-temporal-db}
-      - POSTGRES_USER=${TEMPORAL_POSTGRES_USER:-temporal}
-      - POSTGRES_PWD=${TEMPORAL_POSTGRES_PASSWORD}
-      - POSTGRES_SEEDS=temporal-db
-      - DYNAMIC_CONFIG_FILE_PATH=config/dynamicconfig/development-sql.yaml
-    image: temporalio/auto-setup:1.24
-    volumes:
-      - ./dynamicconfig:/etc/temporal/config/dynamicconfig
+  temporal-managed:
+    <<: *temporal-base
+    profiles:
+      - managed-db
 
-  temporal-admin-tools:
+  temporal:
+    <<: *temporal-base
+    profiles:
+      - self-hosted-db
     depends_on:
-      - temporal
-    environment:
-      - TEMPORAL_ADDRESS=temporal:7233
-      - TEMPORAL_CLI_ADDRESS=temporal:7233
-    image: temporalio/admin-tools:1.24
-    stdin_open: true
-    tty: true
+      - temporal-db
 
   temporal-db:
     image: postgres:16
+    restart: unless-stopped
+    volumes:
+      - temporal-db-data:/var/lib/postgresql/data
+    profiles:
+      - self-hosted-db
     environment:
       - POSTGRES_DB=${TEMPORAL_POSTGRES_DB:-temporal}
       - POSTGRES_USER=${TEMPORAL_POSTGRES_USER:-temporal}
       - POSTGRES_PASSWORD=${TEMPORAL_POSTGRES_PASSWORD}
-    volumes:
-      - temporal-db-data:/var/lib/postgresql/data
     healthcheck:
       test: [ "CMD-SHELL", "pg_isready -d ${TEMPORAL_POSTGRES_DB:-temporal} -U ${TEMPORAL_POSTGRES_USER:-temporal}" ]
-
+ 
       interval: 1s
       timeout: 5s
       retries: 10
@@ -49,8 +65,8 @@ services:
     depends_on:
       - temporal
     environment:
-      - TEMPORAL_ADDRESS=temporal:7233
-      - TEMPORAL_CORS_ORIGINS=http://localhost:3000
+      - TEMPORAL_ADDRESS=${TEMPORAL_ADDRESS:-temporal:7233}
+      - TEMPORAL_CORS_ORIGINS=${TEMPORAL_CORS_ORIGINS:-http://localhost:3000}
     ports:
       - 9000:8080  # Since 8080 is already used by agents-api
 
diff --git a/scheduler/dynamicconfig/development-sql.yaml b/scheduler/dynamicconfig/temporal-postgres.yaml
similarity index 61%
rename from scheduler/dynamicconfig/development-sql.yaml
rename to scheduler/dynamicconfig/temporal-postgres.yaml
index 8862dfad7..e9902c070 100644
--- a/scheduler/dynamicconfig/development-sql.yaml
+++ b/scheduler/dynamicconfig/temporal-postgres.yaml
@@ -2,5 +2,5 @@ limit.maxIDLength:
   - value: 255
     constraints: {}
 system.forceSearchAttributesCacheRefreshOnRead:
-  - value: true # Dev setup only. Please don't turn this on in production.
+  - value: false
     constraints: {}