diff --git a/api/.env.example b/api/.env.example
index 5bc4cffeb17..566c094cd09 100644
--- a/api/.env.example
+++ b/api/.env.example
@@ -231,6 +231,7 @@ VECTOR_INDEX_NAME_PREFIX=Vector_index
 
 # Weaviate configuration
 WEAVIATE_ENDPOINT=http://localhost:8080
+WEAVIATE_GRPC_ENDPOINT=grpc://localhost:50051
 WEAVIATE_API_KEY=WVF5YThaHlkYwhGUSmCRgsX3tD5ngdN8pkih
 WEAVIATE_BATCH_SIZE=100
 WEAVIATE_TOKENIZATION=word
diff --git a/api/tests/integration_tests/.env.example b/api/tests/integration_tests/.env.example
index 98186d59e83..f3e491001dd 100644
--- a/api/tests/integration_tests/.env.example
+++ b/api/tests/integration_tests/.env.example
@@ -61,6 +61,7 @@ CONSOLE_CORS_ALLOW_ORIGINS=http://127.0.0.1:3000,*
 VECTOR_STORE=weaviate
 # Weaviate configuration
 WEAVIATE_ENDPOINT=http://localhost:8080
+WEAVIATE_GRPC_ENDPOINT=grpc://localhost:50051
 WEAVIATE_API_KEY=WVF5YThaHlkYwhGUSmCRgsX3tD5ngdN8pkih
 WEAVIATE_BATCH_SIZE=100
 WEAVIATE_TOKENIZATION=word
diff --git a/docker/docker-compose-template.yaml b/docker/docker-compose-template.yaml
index 1a256c7ec15..1a76247cff5 100644
--- a/docker/docker-compose-template.yaml
+++ b/docker/docker-compose-template.yaml
@@ -819,7 +819,7 @@ services:
 
   # The Weaviate vector store.
   weaviate:
-    image: semitechnologies/weaviate:1.27.0
+    image: cr.weaviate.io/semitechnologies/weaviate:1.39.0
     profiles:
       - weaviate
     restart: always
diff --git a/docker/docker-compose.middleware.yaml b/docker/docker-compose.middleware.yaml
index 23c964a38fc..19b2a8a7af0 100644
--- a/docker/docker-compose.middleware.yaml
+++ b/docker/docker-compose.middleware.yaml
@@ -226,7 +226,7 @@ services:
 
   # The Weaviate vector store.
   weaviate:
-    image: semitechnologies/weaviate:1.27.0
+    image: cr.weaviate.io/semitechnologies/weaviate:1.39.0
     profiles:
       - ""
       - weaviate
diff --git a/docker/docker-compose.yaml b/docker/docker-compose.yaml
index 4d95add637f..5e7681e86cb 100644
--- a/docker/docker-compose.yaml
+++ b/docker/docker-compose.yaml
@@ -825,7 +825,7 @@ services:
 
   # The Weaviate vector store.
   weaviate:
-    image: semitechnologies/weaviate:1.27.0
+    image: cr.weaviate.io/semitechnologies/weaviate:1.39.0
     profiles:
       - weaviate
     restart: always
diff --git a/docker/envs/middleware.env.example b/docker/envs/middleware.env.example
index 3ff8139ad16..8c4ef7d04be 100644
--- a/docker/envs/middleware.env.example
+++ b/docker/envs/middleware.env.example
@@ -147,6 +147,7 @@ EXPOSE_REDIS_PORT=6379
 EXPOSE_SANDBOX_PORT=8194
 EXPOSE_SSRF_PROXY_PORT=3128
 EXPOSE_WEAVIATE_PORT=8080
+EXPOSE_WEAVIATE_GRPC_PORT=50051
 
 # ------------------------------
 # Plugin Daemon Configuration