diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 52f68c2..95b4faf 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -2,35 +2,35 @@ name: "CodeQL"
 
 on:
   push:
-    branches: [ master ]
+    branches: [master]
   pull_request:
-    branches: [ master ]
+    branches: [master]
   schedule:
-    - cron: '43 18 * * 0'
+    - cron: '30 1 * * 0'
 
 jobs:
-  analyze:
-    name: Analyze
+  CodeQL-Build:
     runs-on: ubuntu-latest
+
     permissions:
-      actions: read
-      contents: read
       security-events: write
 
-    strategy:
-      fail-fast: false
-      matrix:
-        language: [ 'java' ]
-
     steps:
-    - name: Checkout repository
-      uses: actions/checkout@v2
-
-    - name: Initialize CodeQL
-      uses: github/codeql-action/init@v1
-      with:
-        languages: ${{ matrix.language }}
-    - name: Autobuild
-      uses: github/codeql-action/autobuild@v1
-    - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v1
+      - name: Checkout repository
+        uses: actions/checkout@v2
+
+      - name: Set up JDK 11
+        uses: actions/setup-java@v1
+        with:
+          java-version: 17
+
+      - name: Initialize CodeQL
+        uses: github/codeql-action/init@v2
+        with:
+          languages: java
+
+      - name: Autobuild
+        uses: github/codeql-action/autobuild@v2
+
+      - name: Perform CodeQL Analysis
+        uses: github/codeql-action/analyze@v2
\ No newline at end of file
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index bca86f5..1ed902d 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -19,7 +19,7 @@ jobs:
       - name: Set up JDK
         uses: actions/setup-java@v1
         with:
-          java-version: 11
+          java-version: 17
       - name: Build with Maven
         run: mvn -B test
       - name: Upload coverage to Codecov
diff --git a/pom.xml b/pom.xml
index aadf3e0..dbf8ee2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.6.6</version>
+        <version>3.0.1</version>
         <relativePath/>
     </parent>
     <groupId>io.github.majusko</groupId>
@@ -15,7 +15,7 @@
     <description>Example project for Spring boot starter for Apache Pulsar</description>
 
     <properties>
-        <java.version>11</java.version>
+        <java.version>17</java.version>
 
         <!--    TESTS    -->
         <testcontainers.version>1.17.6</testcontainers.version>
@@ -27,7 +27,7 @@
         <dependency>
             <groupId>io.github.majusko</groupId>
             <artifactId>pulsar-java-spring-boot-starter</artifactId>
-            <version>1.1.2</version>
+            <version>1.2.0</version>
         </dependency>
 
 
diff --git a/src/main/java/io/github/majusko/java/pulsar/example/error/PulsarErrorHandler.java b/src/main/java/io/github/majusko/java/pulsar/example/error/PulsarErrorHandler.java
index ab8cbc7..348a504 100644
--- a/src/main/java/io/github/majusko/java/pulsar/example/error/PulsarErrorHandler.java
+++ b/src/main/java/io/github/majusko/java/pulsar/example/error/PulsarErrorHandler.java
@@ -2,20 +2,22 @@
 
 import io.github.majusko.pulsar.consumer.ConsumerAggregator;
 import org.springframework.boot.context.event.ApplicationReadyEvent;
+import org.springframework.context.annotation.DependsOn;
 import org.springframework.context.event.EventListener;
 import org.springframework.stereotype.Service;
 
 @Service
+@DependsOn({"consumerAggregator"})
 public class PulsarErrorHandler {
 
-    private final ConsumerAggregator aggregator;
+    private final ConsumerAggregator consumerAggregator;
 
-    public PulsarErrorHandler(ConsumerAggregator aggregator) {
-        this.aggregator = aggregator;
+    public PulsarErrorHandler(ConsumerAggregator consumerAggregator) {
+        this.consumerAggregator = consumerAggregator;
     }
 
     @EventListener(ApplicationReadyEvent.class)
     public void pulsarErrorHandler() {
-        aggregator.onError(failedMessage -> failedMessage.getException().printStackTrace());
+        consumerAggregator.onError(failedMessage -> failedMessage.getException().printStackTrace());
     }
 }
diff --git a/src/test/java/io/github/majusko/java/pulsar/example/JavaPulsarExampleApplicationTests.java b/src/test/java/io/github/majusko/java/pulsar/example/JavaPulsarExampleApplicationTests.java
index 3f467c1..066b56b 100644
--- a/src/test/java/io/github/majusko/java/pulsar/example/JavaPulsarExampleApplicationTests.java
+++ b/src/test/java/io/github/majusko/java/pulsar/example/JavaPulsarExampleApplicationTests.java
@@ -2,6 +2,7 @@
 
 import io.github.majusko.java.pulsar.example.consumer.ConsumerService;
 import io.github.majusko.java.pulsar.example.producer.ProducerService;
+import io.github.majusko.pulsar.consumer.ConsumerAggregator;
 import org.apache.pulsar.client.api.PulsarClientException;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -9,6 +10,7 @@
 import org.springframework.test.context.DynamicPropertyRegistry;
 import org.springframework.test.context.DynamicPropertySource;
 import org.testcontainers.containers.PulsarContainer;
+import org.testcontainers.containers.wait.strategy.Wait;
 import org.testcontainers.junit.jupiter.Container;
 import org.testcontainers.junit.jupiter.Testcontainers;
 import org.testcontainers.utility.DockerImageName;
@@ -19,6 +21,9 @@
 @Testcontainers
 class JavaPulsarExampleApplicationTests {
 
+    @Autowired
+    private ConsumerAggregator consumerAggregator;
+
     @Autowired
     private ProducerService producerService;
 
@@ -26,7 +31,8 @@ class JavaPulsarExampleApplicationTests {
     private ConsumerService consumerService;
 
     @Container
-    static PulsarContainer pulsarContainer = new PulsarContainer(DockerImageName.parse("apachepulsar/pulsar:latest"));
+    static PulsarContainer pulsarContainer = new PulsarContainer(DockerImageName.parse("apachepulsar/pulsar:latest"))
+        .waitingFor(Wait.forListeningPort());
 
     @DynamicPropertySource
     static void propertySettings(DynamicPropertyRegistry registry) {