diff --git a/docker/docker-compose.yaml b/docker/docker-compose.yml
similarity index 100%
rename from docker/docker-compose.yaml
rename to docker/docker-compose.yml
diff --git a/prism-image-search/docker-compose-asdb-6.4.yml b/prism-image-search/docker-compose-asdb-6.4.yml
index 33b79e5..9843fad 100644
--- a/prism-image-search/docker-compose-asdb-6.4.yml
+++ b/prism-image-search/docker-compose-asdb-6.4.yml
@@ -31,21 +31,21 @@ services:
       - ./container-volumes/avs/etc/aerospike-vector-search:/etc/aerospike-vector-search
       - ${FEATURE_KEY:-./container-volumes/avs/etc/aerospike-vector-search/features.conf}:/etc/aerospike-vector-search/features.conf:ro
     healthcheck:
-      test: ["CMD", "curl", "-f", "http://aerospike-vector-search:5040/manage/rest/v1"]
+      test: ["CMD", "curl", "-f", "http://avs:5040/manage/rest/v1"]
       interval: 5s
       timeout: 20s
       retries: 10
   app:
     image: "aerospike/prism-search-example:latest"
     depends_on: 
-      aerospike-vector-search:
+      avs:
         condition: service_healthy
     ports:
       - "8080:8080"
     networks:
       - avs-demo
     environment:
-      AVS_HOST: aerospike-vector-search
+      AVS_HOST: avs
       AVS_PORT: "5000"
       APP_NUM_QUOTES: "5000"
       GRPC_DNS_RESOLVER: native
@@ -76,7 +76,7 @@ services:
     depends_on:
       update-targets:
         condition: service_completed_successfully
-      aerospike-vector-search:
+      avs:
         condition: service_healthy
     networks:
       - avs-demo
diff --git a/prism-image-search/docker-compose-dev.yml b/prism-image-search/docker-compose-dev.yml
index d613bbb..e02460f 100644
--- a/prism-image-search/docker-compose-dev.yml
+++ b/prism-image-search/docker-compose-dev.yml
@@ -33,21 +33,21 @@ services:
       - ./container-volumes/avs/etc/aerospike-vector-search:/etc/aerospike-vector-search
       - ${FEATURE_KEY:-./container-volumes/avs/etc/aerospike-vector-search/features.conf}:/etc/aerospike-vector-search/features.conf:ro
     healthcheck:
-      test: ["CMD", "curl", "-f", "http://aerospike-vector-search:5040/manage/rest/v1"]
+      test: ["CMD", "curl", "-f", "http://avs:5040/manage/rest/v1"]
       interval: 5s
       timeout: 20s
       retries: 10
   app:
     image: "prism:latest"
     depends_on: 
-      aerospike-vector-search:
+      avs:
         condition: service_healthy
     ports:
       - "8080:8080"
     networks:
       - avs-demo
     environment:
-      AVS_HOST: aerospike-vector-search
+      AVS_HOST: avs
       AVS_PORT: "5000"
       APP_NUM_QUOTES: "5000"
       GRPC_DNS_RESOLVER: native
@@ -78,7 +78,7 @@ services:
     depends_on:
       update-targets:
         condition: service_completed_successfully
-      aerospike-vector-search:
+      avs:
         condition: service_healthy
     networks:
       - avs-demo
diff --git a/prism-image-search/docker-compose.yml b/prism-image-search/docker-compose.yml
index c3dd68d..cbc6be6 100644
--- a/prism-image-search/docker-compose.yml
+++ b/prism-image-search/docker-compose.yml
@@ -31,21 +31,21 @@ services:
       - ./container-volumes/avs/etc/aerospike-vector-search:/etc/aerospike-vector-search
       - ${FEATURE_KEY:-./container-volumes/avs/etc/aerospike-vector-search/features.conf}:/etc/aerospike-vector-search/features.conf:ro
     healthcheck:
-      test: ["CMD", "curl", "-f", "http://aerospike-vector-search:5040/manage/rest/v1"]
+      test: ["CMD", "curl", "-f", "http://avs:5040/manage/rest/v1"]
       interval: 5s
       timeout: 20s
       retries: 10
   app:
     image: "aerospike/prism-search-example:latest"
     depends_on: 
-      aerospike-vector-search:
+      avs:
         condition: service_healthy
     ports:
       - "8080:8080"
     networks:
       - avs-demo
     environment:
-      AVS_HOST: aerospike-vector-search
+      AVS_HOST: avs
       AVS_PORT: "5000"
       APP_NUM_QUOTES: "5000"
       GRPC_DNS_RESOLVER: native
@@ -76,7 +76,7 @@ services:
     depends_on:
       update-targets:
         condition: service_completed_successfully
-      aerospike-vector-search:
+      avs:
         condition: service_healthy
     networks:
       - avs-demo
diff --git a/quote-semantic-search/docker-compose-asdb-6.4.yml b/quote-semantic-search/docker-compose-asdb-6.4.yml
index 26d0797..506dbcd 100644
--- a/quote-semantic-search/docker-compose-asdb-6.4.yml
+++ b/quote-semantic-search/docker-compose-asdb-6.4.yml
@@ -33,14 +33,14 @@ services:
       - ./container-volumes/avs/etc/aerospike-vector-search:/etc/aerospike-vector-search
       - ${FEATURE_KEY:-./container-volumes/avs/etc/aerospike-vector-search/features.conf}:/etc/aerospike-vector-search/features.conf:ro
     healthcheck:
-      test: ["CMD", "curl", "-f", "http://aerospike-vector-search:5040/manage/rest/v1"]
+      test: ["CMD", "curl", "-f", "http://avs:5040/manage/rest/v1"]
       interval: 5s
       timeout: 20s
       retries: 10
   app:
     image: "quote-search:latest"
     depends_on:
-      aerospike-vector-search:
+      avs:
         condition: service_healthy
     ports:
       - "8080:8080"
@@ -49,7 +49,7 @@ services:
     volumes:
       - ./container-volumes/quote-search/data:/container-volumes/quote-search/data
     environment:
-      AVS_HOST: aerospike-vector-search
+      AVS_HOST: avs
       AVS_PORT: "5000"
       APP_NUM_QUOTES: "5000"
       GRPC_DNS_RESOLVER: native
@@ -78,7 +78,7 @@ services:
     depends_on:
       update-targets:
         condition: service_completed_successfully
-      aerospike-vector-search:
+      avs:
         condition: service_healthy
     networks:
       - avs-demo
diff --git a/quote-semantic-search/docker-compose-dev.yml b/quote-semantic-search/docker-compose-dev.yml
index bf32e58..3ec2baa 100644
--- a/quote-semantic-search/docker-compose-dev.yml
+++ b/quote-semantic-search/docker-compose-dev.yml
@@ -33,14 +33,14 @@ services:
       - ./container-volumes/avs/etc/aerospike-vector-search:/etc/aerospike-vector-search
       - ${FEATURE_KEY:-./container-volumes/avs/etc/aerospike-vector-search/features.conf}:/etc/aerospike-vector-search/features.conf:ro
     healthcheck:
-      test: ["CMD", "curl", "-f", "http://aerospike-vector-search:5040/manage/rest/v1"]
+      test: ["CMD", "curl", "-f", "http://avs:5040/manage/rest/v1"]
       interval: 5s
       timeout: 20s
       retries: 10
   app:
     image: "quote-search:latest"
     depends_on:
-      aerospike-vector-search:
+      avs:
         condition: service_healthy
     ports:
       - "8080:8080"
@@ -49,7 +49,7 @@ services:
     volumes:
       - ./container-volumes/quote-search/data:/container-volumes/quote-search/data
     environment:
-      AVS_HOST: aerospike-vector-search
+      AVS_HOST: avs
       AVS_PORT: "5000"
       APP_NUM_QUOTES: "5000"
       GRPC_DNS_RESOLVER: native
@@ -78,7 +78,7 @@ services:
     depends_on:
       update-targets:
         condition: service_completed_successfully
-      aerospike-vector-search:
+      avs:
         condition: service_healthy
     networks:
       - avs-demo
diff --git a/quote-semantic-search/docker-compose.yml b/quote-semantic-search/docker-compose.yml
index f2a7732..6acf9cf 100644
--- a/quote-semantic-search/docker-compose.yml
+++ b/quote-semantic-search/docker-compose.yml
@@ -33,14 +33,14 @@ services:
       - ./container-volumes/avs/etc/aerospike-vector-search:/etc/aerospike-vector-search
       - ${FEATURE_KEY:-./container-volumes/avs/etc/aerospike-vector-search/features.conf}:/etc/aerospike-vector-search/features.conf:ro
     healthcheck:
-      test: ["CMD", "curl", "-f", "http://aerospike-vector-search:5040/manage/rest/v1"]
+      test: ["CMD", "curl", "-f", "http://avs:5040/manage/rest/v1"]
       interval: 5s
       timeout: 20s
       retries: 10
   app:
     image: "aerospike/quote-search-example:latest"
     depends_on:
-      aerospike-vector-search:
+      avs:
         condition: service_healthy
     ports:
       - "8080:8080"
@@ -49,7 +49,7 @@ services:
     volumes:
       - ./container-volumes/quote-search/data:/container-volumes/quote-search/data
     environment:
-      AVS_HOST: aerospike-vector-search
+      AVS_HOST: avs
       AVS_PORT: "5000"
       APP_NUM_QUOTES: "5000"
       GRPC_DNS_RESOLVER: native
@@ -78,7 +78,7 @@ services:
     depends_on:
       update-targets:
         condition: service_completed_successfully
-      aerospike-vector-search:
+      avs:
         condition: service_healthy
     networks:
       - avs-demo