diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
index 798f86639..d62986179 100644
--- a/.github/workflows/main.yaml
+++ b/.github/workflows/main.yaml
@@ -24,7 +24,7 @@ jobs:
           version: "22.10"
       - uses: actions/setup-python@v4
         with:
-          python-version: "3.10"
+          python-version: "3.11"
           cache: 'pip' # caching pip dependencies
       - run: pip install -r requirements-devel.txt
       - name: "Flake 8"
@@ -40,7 +40,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        version: ["3.8", "3.9", "3.10", "3.11"]
+        version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
         folder: ["weaviate"]
     steps:
       - uses: actions/checkout@v3
@@ -58,7 +58,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        version: ["3.8", "3.9", "3.10", "3.11"]
+        version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
         folder: ["test", "mock_tests"]
     steps:
       - uses: actions/checkout@v3
@@ -82,7 +82,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        version: [ "3.8", "3.9", "3.10", "3.11"]
+        version: [ "3.8", "3.9", "3.10", "3.11", "3.12"]
         optional_dependencies: [false]
         include:
           - version: "3.11"
@@ -154,10 +154,10 @@ jobs:
         uses: actions/checkout@v3
         with:
           fetch-depth: 0
-      - name: Set up Python 3.10
+      - name: Set up Python 3.11
         uses: actions/setup-python@v4
         with:
-          python-version: "3.10"
+          python-version: "3.11"
           cache: 'pip' # caching pip dependencies
       - name: Install dependencies
         run: pip install -r requirements-devel.txt
@@ -210,10 +210,10 @@ jobs:
         uses: actions/checkout@v3
         with:
           fetch-depth: 0
-      - name: Set up Python 3.10
+      - name: Set up Python 3.11
         uses: actions/setup-python@v4
         with:
-          python-version: "3.10"
+          python-version: "3.11"
           cache: 'pip' # caching pip dependencies
       - name: Install dependencies
         run: pip install -r requirements-devel.txt
diff --git a/ci/docker-compose-async.yml b/ci/docker-compose-async.yml
index c0b74578b..3a8b2978e 100644
--- a/ci/docker-compose-async.yml
+++ b/ci/docker-compose-async.yml
@@ -9,7 +9,7 @@ services:
       - '8090'
       - --scheme
       - http
-    image: semitechnologies/weaviate:preview-add-vectorqueuesize-to-schema-classname-shards-response-afa42cb
+    image: semitechnologies/weaviate:1.22.0
     ports:
       - "8090:8090"
     restart: on-failure:0
diff --git a/ci/docker-compose-azure.yml b/ci/docker-compose-azure.yml
index 44fbf2fe1..fb9d280af 100644
--- a/ci/docker-compose-azure.yml
+++ b/ci/docker-compose-azure.yml
@@ -10,7 +10,7 @@ services:
       - --scheme
       - http
       - --write-timeout=600s
-    image: semitechnologies/weaviate:preview-add-vectorqueuesize-to-schema-classname-shards-response-afa42cb
+    image: semitechnologies/weaviate:1.22.0
     ports:
       - 8081:8081
     restart: on-failure:0
diff --git a/ci/docker-compose-cluster.yml b/ci/docker-compose-cluster.yml
index 20bc58066..af9e5a4fd 100644
--- a/ci/docker-compose-cluster.yml
+++ b/ci/docker-compose-cluster.yml
@@ -2,7 +2,7 @@
 version: '3.4'
 services:
   weaviate-node-1:
-    image: semitechnologies/weaviate:preview-add-vectorqueuesize-to-schema-classname-shards-response-afa42cb
+    image: semitechnologies/weaviate:1.22.0
     restart: on-failure:0
     ports:
       - "8087:8080"
@@ -25,7 +25,7 @@ services:
       - '8080'
       - --scheme
       - http
-    image: semitechnologies/weaviate:preview-add-vectorqueuesize-to-schema-classname-shards-response-afa42cb
+    image: semitechnologies/weaviate:1.22.0
     ports:
       - 8088:8080
       - 6061:6060
diff --git a/ci/docker-compose-okta-cc.yml b/ci/docker-compose-okta-cc.yml
index 1cdbdfb76..626d899b9 100644
--- a/ci/docker-compose-okta-cc.yml
+++ b/ci/docker-compose-okta-cc.yml
@@ -10,7 +10,7 @@ services:
       - --scheme
       - http
       - --write-timeout=600s
-    image: semitechnologies/weaviate:preview-add-vectorqueuesize-to-schema-classname-shards-response-afa42cb
+    image: semitechnologies/weaviate:1.22.0
     ports:
       - 8082:8082
     restart: on-failure:0
diff --git a/ci/docker-compose-okta-users.yml b/ci/docker-compose-okta-users.yml
index b1fd8f51d..b7ac8d6a2 100644
--- a/ci/docker-compose-okta-users.yml
+++ b/ci/docker-compose-okta-users.yml
@@ -10,7 +10,7 @@ services:
       - --scheme
       - http
       - --write-timeout=600s
-    image: semitechnologies/weaviate:preview-add-vectorqueuesize-to-schema-classname-shards-response-afa42cb
+    image: semitechnologies/weaviate:1.22.0
     ports:
       - 8083:8083
     restart: on-failure:0
diff --git a/ci/docker-compose-openai.yml b/ci/docker-compose-openai.yml
index 4bec986a1..6bad9a9f9 100644
--- a/ci/docker-compose-openai.yml
+++ b/ci/docker-compose-openai.yml
@@ -9,7 +9,7 @@ services:
       - '8086'
       - --scheme
       - http
-    image: semitechnologies/weaviate:preview-add-vectorqueuesize-to-schema-classname-shards-response-afa42cb
+    image: semitechnologies/weaviate:1.22.0
     ports:
       - 8086:8086
     restart: on-failure:0
diff --git a/ci/docker-compose-wcs.yml b/ci/docker-compose-wcs.yml
index f19b076fb..a8e85d236 100644
--- a/ci/docker-compose-wcs.yml
+++ b/ci/docker-compose-wcs.yml
@@ -10,7 +10,7 @@ services:
       - --scheme
       - http
       - --write-timeout=600s
-    image: semitechnologies/weaviate:preview-add-vectorqueuesize-to-schema-classname-shards-response-afa42cb
+    image: semitechnologies/weaviate:1.22.0
     ports:
       - 8085:8085
     restart: on-failure:0
diff --git a/ci/docker-compose.yml b/ci/docker-compose.yml
index bcfbff6c6..c6d0ebd88 100644
--- a/ci/docker-compose.yml
+++ b/ci/docker-compose.yml
@@ -10,7 +10,7 @@ services:
       - --scheme
       - http
       - --write-timeout=600s
-    image: semitechnologies/weaviate:preview-add-vectorqueuesize-to-schema-classname-shards-response-afa42cb
+    image: semitechnologies/weaviate:1.22.0
     ports:
       - "8080:8080"
       - "50051:50051"
diff --git a/docs/changelog.rst b/docs/changelog.rst
index 781f1fb7c..8046b8ded 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -1,5 +1,22 @@
 Changelog
 =========
+Version 3.25.0
+--------------
+This minor version includes:
+
+- Support for new Weaviate nested objects on insert and query
+    - ``client.data_object.create()`` now supports nested objects
+    - ``client.query.get()`` now supports nested objects
+- Updates to use Weaviate's v1 gRPC API
+- Support for batching with Weaviate>1.22.0 version and async vector indexing
+- Addition of the `client.batch.wait_for_async_indexing()` method to force block until async indexing is complete
+- Add tests for Python 3.12 to ensure compatibility
+
+Version 3.24.2
+--------------
+This patch version includes:
+
+- Small fix to the batching process to ensure that failed multi-tenant objects are re-added to the batch with their tenant attached
 
 Version 3.24.1
 --------------
diff --git a/integration/test_cluster.py b/integration/test_cluster.py
index 396650d63..93dbfa551 100644
--- a/integration/test_cluster.py
+++ b/integration/test_cluster.py
@@ -4,8 +4,8 @@
 
 import weaviate
 
-GIT_HASH = "afa42cb"
-SERVER_VERSION = "1.22.0-rc.0"
+GIT_HASH = "b4f2ffb"
+SERVER_VERSION = "1.22.0"
 NODE_NAME = "node1"
 NUM_OBJECT = 10