diff --git a/.github/workflows/dotnet.yaml b/.github/workflows/dotnet.yaml
index f81b04e2..0b1b620f 100644
--- a/.github/workflows/dotnet.yaml
+++ b/.github/workflows/dotnet.yaml
@@ -45,11 +45,9 @@ jobs:
           name: ${{ inputs.docker-image-artifact-name }}
           path: /tmp/server-docker
 
-      - name: Load server Docker Images
+      - name: Load server Docker image
         if: ${{ inputs.docker-image-artifact-name }}
-        run: |
-          docker load --input /tmp/server-docker/temporal-server.tar
-          docker load --input /tmp/server-docker/temporal-admin-tools.tar
+        run: docker load --input /tmp/server-docker/temporal-autosetup.tar
         working-directory: '.'
 
       - name: Override IMAGE_TAG environment variable
@@ -112,7 +110,7 @@ jobs:
           docker compose \
             -f ./dockerfiles/docker-compose.for-server-image.yaml \
             -f /tmp/server-docker/docker-compose.yml \
-            up -d cassandra elasticsearch temporal-admin-tools temporal-server
+            up -d temporal-server cassandra elasticsearch
 
       - name: Run SDK-features tests directly
         if: inputs.docker-image-artifact-name == ''
diff --git a/.github/workflows/go.yaml b/.github/workflows/go.yaml
index 4ba25139..79042e59 100644
--- a/.github/workflows/go.yaml
+++ b/.github/workflows/go.yaml
@@ -45,11 +45,9 @@ jobs:
           name: ${{ inputs.docker-image-artifact-name }}
           path: /tmp/server-docker
 
-      - name: Load server Docker Images
+      - name: Load server Docker image
         if: ${{ inputs.docker-image-artifact-name }}
-        run: |
-          docker load --input /tmp/server-docker/temporal-server.tar
-          docker load --input /tmp/server-docker/temporal-admin-tools.tar
+        run: docker load --input /tmp/server-docker/temporal-autosetup.tar
         working-directory: '.'
 
       - name: Override IMAGE_TAG environment variable
@@ -89,7 +87,7 @@ jobs:
           docker compose \
             -f ./dockerfiles/docker-compose.for-server-image.yaml \
             -f /tmp/server-docker/docker-compose.yml \
-            up -d cassandra elasticsearch temporal-admin-tools temporal-server
+            up -d temporal-server cassandra elasticsearch
 
       - name: Run SDK-features tests directly
         if: inputs.docker-image-artifact-name == ''
diff --git a/.github/workflows/java.yaml b/.github/workflows/java.yaml
index 959cc078..e7382669 100644
--- a/.github/workflows/java.yaml
+++ b/.github/workflows/java.yaml
@@ -46,11 +46,9 @@ jobs:
           name: ${{ inputs.docker-image-artifact-name }}
           path: /tmp/server-docker
 
-      - name: Load server Docker Images
+      - name: Load server Docker image
         if: ${{ inputs.docker-image-artifact-name }}
-        run: |
-          docker load --input /tmp/server-docker/temporal-server.tar
-          docker load --input /tmp/server-docker/temporal-admin-tools.tar
+        run: docker load --input /tmp/server-docker/temporal-autosetup.tar
         working-directory: '.'
 
       - name: Override IMAGE_TAG environment variable
@@ -95,7 +93,7 @@ jobs:
           docker compose \
             -f ./dockerfiles/docker-compose.for-server-image.yaml \
             -f /tmp/server-docker/docker-compose.yml \
-            up -d cassandra elasticsearch temporal-admin-tools temporal-server
+            up -d temporal-server cassandra elasticsearch
 
       - name: Run SDK-features tests directly
         if: inputs.docker-image-artifact-name == ''
diff --git a/.github/workflows/php.yaml b/.github/workflows/php.yaml
index d341120a..d85da31a 100644
--- a/.github/workflows/php.yaml
+++ b/.github/workflows/php.yaml
@@ -47,11 +47,9 @@ jobs:
           name: ${{ inputs.docker-image-artifact-name }}
           path: /tmp/server-docker
 
-      - name: Load server Docker Images
+      - name: Load server Docker image
         if: ${{ inputs.docker-image-artifact-name }}
-        run: |
-          docker load --input /tmp/server-docker/temporal-server.tar
-          docker load --input /tmp/server-docker/temporal-admin-tools.tar
+        run: docker load --input /tmp/server-docker/temporal-autosetup.tar
         working-directory: '.'
 
       - name: Override IMAGE_TAG environment variable
@@ -87,7 +85,7 @@ jobs:
           docker compose \
             -f ./dockerfiles/docker-compose.for-server-image.yaml \
             -f /tmp/server-docker/docker-compose.yml \
-            up -d cassandra elasticsearch temporal-admin-tools temporal-server
+            up -d temporal-server cassandra elasticsearch
 
       - name: Run SDK-features tests directly
         if: inputs.docker-image-artifact-name == ''
diff --git a/.github/workflows/python.yaml b/.github/workflows/python.yaml
index 4ea303dc..d2f6e1f4 100644
--- a/.github/workflows/python.yaml
+++ b/.github/workflows/python.yaml
@@ -45,11 +45,9 @@ jobs:
           name: ${{ inputs.docker-image-artifact-name }}
           path: /tmp/server-docker
 
-      - name: Load server Docker Images
+      - name: Load server Docker image
         if: ${{ inputs.docker-image-artifact-name }}
-        run: |
-          docker load --input /tmp/server-docker/temporal-server.tar
-          docker load --input /tmp/server-docker/temporal-admin-tools.tar
+        run: docker load --input /tmp/server-docker/temporal-autosetup.tar
         working-directory: '.'
 
       - name: Override IMAGE_TAG environment variable
@@ -114,7 +112,7 @@ jobs:
           docker compose \
             -f ./dockerfiles/docker-compose.for-server-image.yaml \
             -f /tmp/server-docker/docker-compose.yml \
-            up -d cassandra elasticsearch temporal-admin-tools temporal-server
+            up -d temporal-server cassandra elasticsearch
 
       - name: Run SDK-features tests directly
         if: inputs.docker-image-artifact-name == ''
diff --git a/.github/workflows/typescript.yaml b/.github/workflows/typescript.yaml
index f8f0af2b..2eb41696 100644
--- a/.github/workflows/typescript.yaml
+++ b/.github/workflows/typescript.yaml
@@ -45,11 +45,9 @@ jobs:
           name: ${{ inputs.docker-image-artifact-name }}
           path: /tmp/server-docker
 
-      - name: Load server Docker Images
+      - name: Load server Docker image
         if: ${{ inputs.docker-image-artifact-name }}
-        run: |
-          docker load --input /tmp/server-docker/temporal-server.tar
-          docker load --input /tmp/server-docker/temporal-admin-tools.tar
+        run: docker load --input /tmp/server-docker/temporal-autosetup.tar
         working-directory: '.'
 
       - name: Override IMAGE_TAG environment variable
@@ -124,7 +122,7 @@ jobs:
           docker compose \
             -f ./dockerfiles/docker-compose.for-server-image.yaml \
             -f /tmp/server-docker/docker-compose.yml \
-            up -d cassandra elasticsearch temporal-admin-tools temporal-server
+            up -d temporal-server cassandra elasticsearch
 
       - name: Run SDK-features tests directly
         if: inputs.docker-image-artifact-name == ''
diff --git a/dockerfiles/docker-compose.for-server-image.yaml b/dockerfiles/docker-compose.for-server-image.yaml
index 7965bb35..48566d62 100644
--- a/dockerfiles/docker-compose.for-server-image.yaml
+++ b/dockerfiles/docker-compose.for-server-image.yaml
@@ -3,60 +3,8 @@
 version: '3.5'
 
 services:
-  # Extend cassandra service with healthcheck and network
-  cassandra:
-    networks:
-      - temporal-dev-network
-    healthcheck:
-      test: ["CMD", "cqlsh", "-e", "describe keyspaces"]
-      interval: 5s
-      timeout: 5s
-      retries: 60
-      start_period: 30s
-
-  # Extend elasticsearch service with healthcheck and network
-  elasticsearch:
-    networks:
-      - temporal-dev-network
-    healthcheck:
-      test: ["CMD-SHELL", "curl -f http://localhost:9200/_cluster/health?wait_for_status=yellow&timeout=1s || exit 1"]
-      interval: 5s
-      timeout: 5s
-      retries: 60
-      start_period: 30s
-
-  temporal-admin-tools:
-    image: temporaliotest/admin-tools:${IMAGE_TAG:-latest}
-    container_name: temporal-admin-tools
-    depends_on:
-      cassandra:
-        condition: service_healthy
-      elasticsearch:
-        condition: service_healthy
-    environment:
-      - CASSANDRA_SEEDS=cassandra
-      - ES_HOST=elasticsearch
-      - ES_PORT=9200
-      - ES_SCHEME=http
-      - ES_VERSION=v7
-      - ES_VISIBILITY_INDEX=temporal_visibility_v1_dev
-    networks:
-      - temporal-dev-network
-    entrypoint: ["/bin/sh", "-c"]
-    command: >
-      "echo 'Starting admin-tools setup...' &&
-       temporal-cassandra-tool --ep cassandra create -k temporal --rf 1 &&
-       temporal-cassandra-tool --ep cassandra -k temporal setup-schema -v 0.0 &&
-       temporal-cassandra-tool --ep cassandra -k temporal update-schema -d /etc/temporal/schema/cassandra/temporal/versioned &&
-       curl -X PUT --fail \"$$ES_SCHEME://$$ES_HOST:$$ES_PORT/_template/temporal_visibility_v1_template\" -H 'Content-Type: application/json' --data-binary \"@/etc/temporal/schema/elasticsearch/visibility/index_template_$$ES_VERSION.json\" &&
-       curl --head --fail \"$$ES_SCHEME://$$ES_HOST:$$ES_PORT/$$ES_VISIBILITY_INDEX\" || curl -X PUT --fail \"$$ES_SCHEME://$$ES_HOST:$$ES_PORT/$$ES_VISIBILITY_INDEX\" &&
-       echo 'Cassandra and Elasticsearch setup complete'"
-
   temporal-server:
-    image: temporaliotest/server:${IMAGE_TAG:-latest}
-    depends_on:
-      temporal-admin-tools:
-        condition: service_completed_successfully
+    image: temporaliotest/auto-setup:${IMAGE_TAG:-latest}
     environment:
       - CASSANDRA_SEEDS=cassandra
       - ENABLE_ES=true
@@ -66,6 +14,9 @@ services:
       - ./dynamicconfig:/etc/temporal/config/dynamicconfig
     ports:
       - '7233:7233'
+    depends_on:
+      - cassandra
+      - elasticsearch
     networks:
       - temporal-dev-network
 
@@ -128,7 +79,3 @@ services:
       - temporal-server
     networks:
       - temporal-dev-network
-
-networks:
-  temporal-dev-network:
-    driver: bridge