diff --git a/build.gradle.kts b/build.gradle.kts
index c600f81d..87c50a2b 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -9,7 +9,7 @@ description = "Experiments with Java"
 
 allprojects {
     group = "io.github.mfvanek"
-    version = "0.2.2"
+    version = "0.3.0"
 
     repositories {
         mavenLocal()
@@ -19,7 +19,7 @@ allprojects {
 
 tasks {
     wrapper {
-        gradleVersion = "8.11"
+        gradleVersion = "8.11.1"
     }
 }
 
diff --git a/buildSrc/src/main/kotlin/sb-ot-demo.java-conventions.gradle.kts b/buildSrc/src/main/kotlin/sb-ot-demo.java-conventions.gradle.kts
index c8c0a80b..0c4ae410 100644
--- a/buildSrc/src/main/kotlin/sb-ot-demo.java-conventions.gradle.kts
+++ b/buildSrc/src/main/kotlin/sb-ot-demo.java-conventions.gradle.kts
@@ -20,7 +20,7 @@ dependencies {
 
     testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
 
-    errorprone("com.google.errorprone:error_prone_core:2.33.0")
+    errorprone("com.google.errorprone:error_prone_core:2.36.0")
     errorprone("jp.skypencil.errorprone.slf4j:errorprone-slf4j:0.1.28")
 }
 
@@ -37,6 +37,7 @@ jacoco {
 tasks {
     withType<JavaCompile>().configureEach {
         options.compilerArgs.add("-parameters")
+        options.compilerArgs.add("--should-stop=ifError=FLOW")
         options.errorprone {
             disableWarningsInGeneratedCode.set(true)
             disable("Slf4jLoggerShouldBeNonStatic")
diff --git a/common-internal-bom/build.gradle.kts b/common-internal-bom/build.gradle.kts
index 1eb73dde..a0c6c699 100644
--- a/common-internal-bom/build.gradle.kts
+++ b/common-internal-bom/build.gradle.kts
@@ -12,7 +12,7 @@ dependencies {
     api(platform("org.assertj:assertj-bom:3.26.3"))
     api(platform("org.testcontainers:testcontainers-bom:1.20.4"))
     api(platform("org.junit:junit-bom:5.11.3"))
-    api(platform("io.github.mfvanek:pg-index-health-bom:0.13.3"))
+    api(platform("io.github.mfvanek:pg-index-health-bom:0.14.0"))
 
     constraints {
         api("org.liquibase:liquibase-core:4.30.0")
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 94113f20..e2847c82 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.11-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 8ade2472..90f2f996 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -3,3 +3,15 @@ include("spring-boot-3-demo-app")
 include("common-internal-bom")
 include("spring-boot-2-demo-app")
 include("db-migrations")
+
+dependencyResolutionManagement {
+    versionCatalogs {
+        create("libs") {
+            val springBoot3Version = version("spring-boot-v3", "3.3.6")
+            plugin("spring-boot-v3", "org.springframework.boot")
+                .versionRef(springBoot3Version)
+            library("spring-boot-v3-dependencies", "org.springframework.boot", "spring-boot-dependencies")
+                .versionRef(springBoot3Version)
+        }
+    }
+}
diff --git a/spring-boot-2-demo-app/src/test/java/io/github/mfvanek/spring/boot2/test/IndexesMaintenanceTest.java b/spring-boot-2-demo-app/src/test/java/io/github/mfvanek/spring/boot2/test/IndexesMaintenanceTest.java
index e8f43439..227b1192 100644
--- a/spring-boot-2-demo-app/src/test/java/io/github/mfvanek/spring/boot2/test/IndexesMaintenanceTest.java
+++ b/spring-boot-2-demo-app/src/test/java/io/github/mfvanek/spring/boot2/test/IndexesMaintenanceTest.java
@@ -1,9 +1,9 @@
 package io.github.mfvanek.spring.boot2.test;
 
-import io.github.mfvanek.pg.common.maintenance.DatabaseCheckOnHost;
-import io.github.mfvanek.pg.common.maintenance.Diagnostic;
-import io.github.mfvanek.pg.model.DbObject;
-import io.github.mfvanek.pg.model.PgContext;
+import io.github.mfvanek.pg.core.checks.common.DatabaseCheckOnHost;
+import io.github.mfvanek.pg.core.checks.common.Diagnostic;
+import io.github.mfvanek.pg.model.context.PgContext;
+import io.github.mfvanek.pg.model.dbobject.DbObject;
 import io.github.mfvanek.pg.model.predicates.SkipLiquibaseTablesPredicate;
 import io.github.mfvanek.spring.boot2.test.support.TestBase;
 import org.junit.jupiter.api.DisplayName;
diff --git a/spring-boot-3-demo-app/build.gradle.kts b/spring-boot-3-demo-app/build.gradle.kts
index db3d2459..111c89d9 100644
--- a/spring-boot-3-demo-app/build.gradle.kts
+++ b/spring-boot-3-demo-app/build.gradle.kts
@@ -1,14 +1,14 @@
 plugins {
     id("sb-ot-demo.java-conventions")
     id("sb-ot-demo.docker")
-    id("org.springframework.boot") version "3.3.4"
+    alias(libs.plugins.spring.boot.v3)
     id("io.freefair.lombok")
 }
 
 dependencies {
     implementation(platform(project(":common-internal-bom")))
     implementation(platform("org.springdoc:springdoc-openapi:2.6.0"))
-    implementation(platform("org.springframework.boot:spring-boot-dependencies:3.3.4"))
+    implementation(platform(libs.spring.boot.v3.dependencies))
 
     implementation("org.springframework.boot:spring-boot-starter-web")
     implementation("org.springframework.boot:spring-boot-starter-actuator")
diff --git a/spring-boot-3-demo-app/src/test/java/io/github/mfvanek/spring/boot3/test/ApplicationTests.java b/spring-boot-3-demo-app/src/test/java/io/github/mfvanek/spring/boot3/test/ApplicationTests.java
index ecc17b19..bb6b10c6 100644
--- a/spring-boot-3-demo-app/src/test/java/io/github/mfvanek/spring/boot3/test/ApplicationTests.java
+++ b/spring-boot-3-demo-app/src/test/java/io/github/mfvanek/spring/boot3/test/ApplicationTests.java
@@ -43,7 +43,7 @@ void contextLoads() {
                 "endpoint=http://localhost:%d, " +
                 "endpointPath=/opentelemetry.proto.collector.trace.v1.TraceService/Export, timeoutNanos=5000000000, " +
                 "connectTimeoutNanos=10000000000, compressorEncoding=null, " +
-                "headers=Headers{User-Agent=OBFUSCATED}}", JaegerInitializer.getFirstMappedPort()));
+                "headers=Headers{User-Agent=OBFUSCATED}, memoryMode=IMMUTABLE_DATA}", JaegerInitializer.getFirstMappedPort()));
     }
 
     @Test
diff --git a/spring-boot-3-demo-app/src/test/java/io/github/mfvanek/spring/boot3/test/IndexesMaintenanceTest.java b/spring-boot-3-demo-app/src/test/java/io/github/mfvanek/spring/boot3/test/IndexesMaintenanceTest.java
index 44ff5df1..bb32ebee 100644
--- a/spring-boot-3-demo-app/src/test/java/io/github/mfvanek/spring/boot3/test/IndexesMaintenanceTest.java
+++ b/spring-boot-3-demo-app/src/test/java/io/github/mfvanek/spring/boot3/test/IndexesMaintenanceTest.java
@@ -1,9 +1,9 @@
 package io.github.mfvanek.spring.boot3.test;
 
-import io.github.mfvanek.pg.common.maintenance.DatabaseCheckOnHost;
-import io.github.mfvanek.pg.common.maintenance.Diagnostic;
-import io.github.mfvanek.pg.model.DbObject;
-import io.github.mfvanek.pg.model.PgContext;
+import io.github.mfvanek.pg.core.checks.common.DatabaseCheckOnHost;
+import io.github.mfvanek.pg.core.checks.common.Diagnostic;
+import io.github.mfvanek.pg.model.context.PgContext;
+import io.github.mfvanek.pg.model.dbobject.DbObject;
 import io.github.mfvanek.pg.model.predicates.SkipLiquibaseTablesPredicate;
 import io.github.mfvanek.spring.boot3.test.support.TestBase;
 import org.junit.jupiter.api.DisplayName;