diff --git a/kafka-questdb-connector-samples/faker/Dockerfile-Connect b/kafka-questdb-connector-samples/faker/Dockerfile-Connect
index 2458304..e657c26 100644
--- a/kafka-questdb-connector-samples/faker/Dockerfile-Connect
+++ b/kafka-questdb-connector-samples/faker/Dockerfile-Connect
@@ -4,5 +4,5 @@ RUN apt-get update && apt-get install -y curl wget unzip jq
 RUN curl -s https://api.github.com/repos/questdb/kafka-questdb-connector/releases/latest | jq -r '.assets[]|select(.content_type == "application/zip")|.browser_download_url'|wget -qi -
 RUN unzip kafka-questdb-connector-*-bin.zip
 
-FROM confluentinc/cp-kafka-connect:7.6.0
+FROM confluentinc/cp-kafka-connect:7.7.0
 COPY --from=builder /opt/kafka-questdb-connector/*.jar /usr/share/java/kafka/
\ No newline at end of file
diff --git a/kafka-questdb-connector-samples/faker/docker-compose.yml b/kafka-questdb-connector-samples/faker/docker-compose.yml
index a984207..e6e201b 100644
--- a/kafka-questdb-connector-samples/faker/docker-compose.yml
+++ b/kafka-questdb-connector-samples/faker/docker-compose.yml
@@ -1,31 +1,28 @@
-version: '2.1'
 services:
   questdb:
-    image: questdb/questdb:7.4.0
+    image: questdb/questdb:8.1.0
     expose:
-      - "9009"
+      - "9000"
     ports:
       - "19000:9000"
     environment:
       - QDB_LINE_DEFAULT_PARTITION_BY=YEAR
-  zookeeper:
-    image: zookeeper:3.6.2
-    ports:
-      - "2181:2181"
   kafka:
-    image: wurstmeister/kafka:2.13-2.8.1
-    ports:
-      - "9092:9092"
-    depends_on:
-      - zookeeper
-    links:
-      - zookeeper:zookeeper
+    image: apache/kafka:latest
+    container_name: broker
     environment:
-      KAFKA_ADVERTISED_HOST_NAME: "kafka"
-      KAFKA_ADVERTISED_PORT: "9092"
-      HOSTNAME_COMMAND: "route -n | awk '/UG[ \t]/{print $$2}'"
-      KAFKA_ZOOKEEPER_CONNECT: zookeeper:2181
-      KAFKA_CREATE_TOPICS: "People:1:1"
+      KAFKA_NODE_ID: 1
+      KAFKA_PROCESS_ROLES: broker,controller
+      KAFKA_LISTENERS: PLAINTEXT://:9092,CONTROLLER://:9093
+      KAFKA_ADVERTISED_LISTENERS: PLAINTEXT://kafka:9092
+      KAFKA_CONTROLLER_LISTENER_NAMES: CONTROLLER
+      KAFKA_LISTENER_SECURITY_PROTOCOL_MAP: CONTROLLER:PLAINTEXT,PLAINTEXT:PLAINTEXT
+      KAFKA_CONTROLLER_QUORUM_VOTERS: 1@localhost:9093
+      KAFKA_OFFSETS_TOPIC_REPLICATION_FACTOR: 1
+      KAFKA_TRANSACTION_STATE_LOG_REPLICATION_FACTOR: 1
+      KAFKA_TRANSACTION_STATE_LOG_MIN_ISR: 1
+      KAFKA_GROUP_INITIAL_REBALANCE_DELAY_MS: 0
+      KAFKA_NUM_PARTITIONS: 3
   producer:
     image: kafka-questdb-connector-samples-faker-generator
     build:
@@ -36,7 +33,7 @@ services:
       - kafka:kafka
       - questdb:questdb
   connect:
-    image: kafka-questdb-connector-samples-debezium
+    image: kafka-questdb-connector-samples-connect
     build:
       dockerfile: ./Dockerfile-Connect
     ports:
diff --git a/kafka-questdb-connector-samples/stocks/docker-compose.yml b/kafka-questdb-connector-samples/stocks/docker-compose.yml
index 29f0e39..4cd8a76 100644
--- a/kafka-questdb-connector-samples/stocks/docker-compose.yml
+++ b/kafka-questdb-connector-samples/stocks/docker-compose.yml
@@ -1,19 +1,13 @@
-version: '2.1'
 services:
   questdb:
-    image: questdb/questdb:7.4.0
+    image: questdb/questdb:8.1.0
     expose:
-      - "9009"
+      - "9000"
     ports:
       - "19000:9000"
     environment:
-      - JAVA_OPTS=-Djava.locale.providers=JRE,SPI
       - QDB_LINE_DEFAULT_PARTITION_BY=YEAR
       - QDB_PG_SELECT_CACHE_ENABLED=false
-  zookeeper:
-    image: zookeeper:3.6.2
-    ports:
-      - "2181:2181"
   grafana:
     image: grafana/grafana-oss:9.2.1
     ports:
@@ -35,19 +29,21 @@ services:
         - GF_AUTH_ANONYMOUS_ORG_NAME=Main Org.
         - GF_AUTH_ANONYMOUS_ORG_ID=1
   kafka:
-    image: wurstmeister/kafka:2.13-2.8.1
-    ports:
-      - "9092:9092"
-    depends_on:
-      - zookeeper
-    links:
-      - zookeeper:zookeeper
+    image: apache/kafka:latest
+    container_name: broker
     environment:
-      KAFKA_ADVERTISED_HOST_NAME: "kafka"
-      KAFKA_ADVERTISED_PORT: "9092"
-      HOSTNAME_COMMAND: "route -n | awk '/UG[ \t]/{print $$2}'"
-      KAFKA_ZOOKEEPER_CONNECT: zookeeper:2181
-      KAFKA_CREATE_TOPICS: "dbserver1.public.stock:1:1"
+      KAFKA_NODE_ID: 1
+      KAFKA_PROCESS_ROLES: broker,controller
+      KAFKA_LISTENERS: PLAINTEXT://:9092,CONTROLLER://:9093
+      KAFKA_ADVERTISED_LISTENERS: PLAINTEXT://kafka:9092
+      KAFKA_CONTROLLER_LISTENER_NAMES: CONTROLLER
+      KAFKA_LISTENER_SECURITY_PROTOCOL_MAP: CONTROLLER:PLAINTEXT,PLAINTEXT:PLAINTEXT
+      KAFKA_CONTROLLER_QUORUM_VOTERS: 1@localhost:9093
+      KAFKA_OFFSETS_TOPIC_REPLICATION_FACTOR: 1
+      KAFKA_TRANSACTION_STATE_LOG_REPLICATION_FACTOR: 1
+      KAFKA_TRANSACTION_STATE_LOG_MIN_ISR: 1
+      KAFKA_GROUP_INITIAL_REBALANCE_DELAY_MS: 0
+      KAFKA_NUM_PARTITIONS: 3
   postgres:
     image: debezium/postgres:14-alpine
     ports: