diff --git a/basic-search/requirements.txt b/basic-search/requirements.txt
index 531469f..721720d 100644
--- a/basic-search/requirements.txt
+++ b/basic-search/requirements.txt
@@ -1 +1 @@
-aerospike-vector-search==0.6.1
\ No newline at end of file
+aerospike-vector-search==1.0.0.dev1
\ No newline at end of file
diff --git a/prism-image-search/container-volumes/aerospike/etc/aerospike/aerospike.conf b/prism-image-search/container-volumes/aerospike/etc/aerospike/aerospike.conf
index 2cbb6f0..0f01b0a 100644
--- a/prism-image-search/container-volumes/aerospike/etc/aerospike/aerospike.conf
+++ b/prism-image-search/container-volumes/aerospike/etc/aerospike/aerospike.conf
@@ -54,7 +54,7 @@ namespace test {
         }
 }
 
-namespace proximus-meta {
+namespace avs-meta {
         replication-factor 1
         nsup-period 100
         
diff --git a/prism-image-search/container-volumes/avs/etc/aerospike-vector-search/aerospike-proximus.yml b/prism-image-search/container-volumes/avs/etc/aerospike-vector-search/aerospike-proximus.yml
deleted file mode 100644
index bcc5d22..0000000
--- a/prism-image-search/container-volumes/avs/etc/aerospike-vector-search/aerospike-proximus.yml
+++ /dev/null
@@ -1,69 +0,0 @@
-# Change the configuration for your use case.
-cluster:
-  # Custom node-id. It will be auto-generated if not specified.
-  # node-id: a1
-
-  # Unique identifier for this cluster.
-  cluster-name: prism-image-search
-
-# The Proximus service listening ports, TLS and network interface.
-service:
-  ports:
-    5000: {}
-
-# Management API listening ports, TLS and network interface.
-manage:
-  ports:
-    5040: {}
-
-# Intra cluster interconnect listening ports, TLS and network interface.
-interconnect:
-  ports:
-    5001: {}
-
-#heartbeat:
-#  seeds:
-#    - address: localhost
-#      port: 6001
-
-# Target Aerospike cluster
-aerospike:
-  seeds:
-    - aerospike:
-        port: 3000
-
-# File based credentials store only if security should be enabled.
-#security:
-#  credentials-store:
-#    type: file
-#    credentials-file: samples/credentials.yml
-#  auth-token:
-#    private-key: samples/auth/private_key.pem
-#    public-key: samples/auth/public_key.pem
-
-# Vault based credentials store only if security should be enabled.
-#security:
-#  credentials-store:
-#    type: vault
-#    url: https://vault:8200
-#    secrets-path: /secret/aerospike/aerodb1
-#    tls:
-#      key-store:
-#        store-type: PEM
-#        store-file: key.pem
-#        store-password-file: keypass.txt # Password protecting key.pem.
-#        certificate-chain-files: certchain.pem
-#      trust-store:
-#        store-type: PEM
-#        certificate-files: cacert.pem
-#  auth-token:
-#    private-key: samples/auth/private_key.pem
-#    public-key: samples/auth/public_key.pem
-
-# The logging properties.
-logging:
-  #format: json
-  #file: /var/log/aerospike-proximus/aerospike-proximus.log
-  enable-console-logging: true
-  levels:
-    metrics-ticker: off
diff --git a/prism-image-search/container-volumes/avs/etc/aerospike-vector-search/aerospike-vector-search.yml b/prism-image-search/container-volumes/avs/etc/aerospike-vector-search/aerospike-vector-search.yml
new file mode 100644
index 0000000..4aeff52
--- /dev/null
+++ b/prism-image-search/container-volumes/avs/etc/aerospike-vector-search/aerospike-vector-search.yml
@@ -0,0 +1,39 @@
+# Change the configuration for your use case.
+cluster:
+  # Custom node-id. It will be auto-generated if not specified.
+  # node-id: a1
+
+  # Unique identifier for this cluster.
+  cluster-name: prism-image-search
+
+# The Proximus service listening ports, TLS and network interface.
+service:
+  ports:
+    5000: {}
+
+# Management API listening ports, TLS and network interface.
+manage:
+  ports:
+    5040: {}
+
+# Intra cluster interconnect listening ports, TLS and network interface.
+interconnect:
+  ports:
+    5001: {}
+
+#heartbeat:
+#  seeds:
+#    - address: localhost
+#      port: 6001
+
+# Target Aerospike cluster
+storage:
+  seeds:
+    - aerospike:
+        port: 3000
+
+# The logging properties.
+logging:
+  enable-console-logging: true
+  levels:
+    metrics-ticker: off
diff --git a/prism-image-search/docker-compose-dev.yml b/prism-image-search/docker-compose-dev.yml
index 046fb8c..3ccb0b2 100644
--- a/prism-image-search/docker-compose-dev.yml
+++ b/prism-image-search/docker-compose-dev.yml
@@ -11,13 +11,13 @@ services:
       - "--config-file"
       - "/opt/aerospike/etc/aerospike/aerospike.conf"
   avs:
-    image: aerospike/aerospike-proximus:0.4.0
+    image: aerospike/aerospike-vector-search:0.9.0
     # ports:
       # - "5000:5000"
     networks:
       - avs-demo
     volumes:
-      - ./container-volumes/avs/etc/aerospike-vector-search:/etc/aerospike-proximus
+      - ./container-volumes/avs/etc/aerospike-vector-search:/etc/aerospike-vector-search
   app:
     build:
       context: .
diff --git a/prism-image-search/docker-compose.yml b/prism-image-search/docker-compose.yml
index a455072..5224869 100644
--- a/prism-image-search/docker-compose.yml
+++ b/prism-image-search/docker-compose.yml
@@ -11,13 +11,13 @@ services:
       - "--config-file"
       - "/opt/aerospike/etc/aerospike/aerospike.conf"
   avs:
-    image: aerospike/aerospike-proximus:0.4.0
+    image: aerospike/aerospike-vector-search:0.9.0
     # ports:
       # - "5000:5000"
     networks:
       - avs-demo
     volumes:
-      - ./container-volumes/avs/etc/aerospike-vector-search:/etc/aerospike-proximus
+      - ./container-volumes/avs/etc/aerospike-vector-search:/etc/aerospike-vector-search
   app:
     image: aerospike/prism-search-example:latest
     ports:
diff --git a/prism-image-search/prism/requirements.txt b/prism-image-search/prism/requirements.txt
index e98d295..6d2ca1d 100644
--- a/prism-image-search/prism/requirements.txt
+++ b/prism-image-search/prism/requirements.txt
@@ -1,6 +1,6 @@
 # TODO: Include exact versions
 # Aerospike dependencies
-aerospike-vector-search==0.6.1
+aerospike-vector-search==1.0.0.dev1
 
 # Flask framework
 flask~=2.3.2
diff --git a/quote-semantic-search/README.md b/quote-semantic-search/README.md
index 59b22bc..0698b46 100644
--- a/quote-semantic-search/README.md
+++ b/quote-semantic-search/README.md
@@ -71,7 +71,7 @@ and [Vue.js](https://vuejs.org/). In order to developer follow the steps to
 setup your Python environment.
 
 ### Setup pip
-Setup pip to use Aerospike PyPI repository following instructions [here](https://github.com/citrusleaf/aerospike-proximus-client-python/tree/main#using-the-client-from-your-application-using-pip).
+Setup pip to use Aerospike PyPI repository following instructions [here](https://github.com/citrusleaf/avs-client-python/tree/main#using-the-client-from-your-application-using-pip).
 
 ### Setup Python Virtual Environment
 
diff --git a/quote-semantic-search/container-volumes/aerospike/etc/aerospike/aerospike.conf b/quote-semantic-search/container-volumes/aerospike/etc/aerospike/aerospike.conf
index 41a8c62..8a01f56 100644
--- a/quote-semantic-search/container-volumes/aerospike/etc/aerospike/aerospike.conf
+++ b/quote-semantic-search/container-volumes/aerospike/etc/aerospike/aerospike.conf
@@ -55,7 +55,7 @@ namespace test {
         }
 }
 
-namespace proximus-meta {
+namespace avs-meta {
         replication-factor 1
         nsup-period 100
 
diff --git a/quote-semantic-search/container-volumes/avs/etc/aerospike-vector-search/aerospike-proximus.yml b/quote-semantic-search/container-volumes/avs/etc/aerospike-vector-search/aerospike-vector-search.yml
similarity index 95%
rename from quote-semantic-search/container-volumes/avs/etc/aerospike-vector-search/aerospike-proximus.yml
rename to quote-semantic-search/container-volumes/avs/etc/aerospike-vector-search/aerospike-vector-search.yml
index ae1cb1c..08f9480 100644
--- a/quote-semantic-search/container-volumes/avs/etc/aerospike-vector-search/aerospike-proximus.yml
+++ b/quote-semantic-search/container-volumes/avs/etc/aerospike-vector-search/aerospike-vector-search.yml
@@ -31,7 +31,7 @@ interconnect:
 #      port: 6001
 
 # Target Aerospike cluster
-aerospike:
+storage:
   seeds:
     - aerospike:
         port: 3000
@@ -66,8 +66,6 @@ aerospike:
 
 # The logging properties.
 logging:
-  #format: json
-  #file: /var/log/aerospike-proximus/aerospike-proximus.log
   enable-console-logging: true
   levels:
     metrics-ticker: off
diff --git a/quote-semantic-search/docker-compose-dev.yml b/quote-semantic-search/docker-compose-dev.yml
index 5cc6f6f..f49f282 100644
--- a/quote-semantic-search/docker-compose-dev.yml
+++ b/quote-semantic-search/docker-compose-dev.yml
@@ -11,13 +11,13 @@ services:
       - "--config-file"
       - "/opt/aerospike/etc/aerospike/aerospike.conf"
   avs:
-    image: aerospike/aerospike-proximus:0.4.0
+    image: aerospike/aerospike-vector-search:0.9.0
     # ports:
     #   - "5002:5002"
     networks:
       - avs-demo
     volumes:
-      - ./container-volumes/avs/etc/aerospike-vector-search:/etc/aerospike-proximus
+      - ./container-volumes/avs/etc/aerospike-vector-search:/etc/aerospike-vector-search
   app:
     build:
       context: .
diff --git a/quote-semantic-search/docker-compose.yml b/quote-semantic-search/docker-compose.yml
index 021a5fa..ee6e8f1 100644
--- a/quote-semantic-search/docker-compose.yml
+++ b/quote-semantic-search/docker-compose.yml
@@ -11,13 +11,13 @@ services:
       - "--config-file"
       - "/opt/aerospike/etc/aerospike/aerospike.conf"
   avs:
-    image: aerospike/aerospike-proximus:0.4.0
+    image: aerospike/aerospike-vector-search:0.9.0
     # ports:
     #   - "5002:5002"
     networks:
       - avs-demo
     volumes:
-      - ./container-volumes/avs/etc/aerospike-vector-search:/etc/aerospike-proximus
+      - ./container-volumes/avs/etc/aerospike-vector-search:/etc/aerospike-vector-search
   app:
     image: aerospike/quote-search-example:latest
     ports:
diff --git a/quote-semantic-search/quote-search/requirements.txt b/quote-semantic-search/quote-search/requirements.txt
index 9c8a368..b8e55fa 100644
--- a/quote-semantic-search/quote-search/requirements.txt
+++ b/quote-semantic-search/quote-search/requirements.txt
@@ -1,6 +1,6 @@
 # TODO: Include exact versions
 # Aerospike dependencies
-aerospike-vector-search==0.6.1
+aerospike-vector-search==1.0.0.dev1
 
 
 # Flask framework