diff --git a/buildSrc/src/main/groovy/io.micronaut.build.internal.graal-test.gradle b/buildSrc/src/main/groovy/io.micronaut.build.internal.graal-test.gradle
index c7b783ea..03b5b45a 100644
--- a/buildSrc/src/main/groovy/io.micronaut.build.internal.graal-test.gradle
+++ b/buildSrc/src/main/groovy/io.micronaut.build.internal.graal-test.gradle
@@ -10,7 +10,7 @@ repositories {
 
 configurations.all {
     resolutionStrategy {
-        force 'io.micronaut.platform:micronaut-platform:4.0.0-M2'
+        force 'io.micronaut.platform:micronaut-platform:4.0.0-M3'
     }
 }
 
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index f0baa552..c236dfdc 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,6 +1,6 @@
 [versions]
 micronaut-docs = "2.0.0"
-micronaut = "4.0.0-M6"
+micronaut = "4.0.0-M7"
 
 groovy = "4.0.12"
 spock = "2.3-groovy-4.0"
@@ -14,9 +14,9 @@ kotlin = "1.8.22"
 testcontainers = "1.18.3"
 
 micronaut-reactor = "3.0.0-M6"
-micronaut-serde = "2.0.0-M9"
-micronaut-test = "4.0.0-M5"
-micronaut-validation = "4.0.0-M9"
+micronaut-serde = "2.0.0-M10"
+micronaut-test = "4.0.0-M7"
+micronaut-validation = "4.0.0-M10"
 micronaut-logging = "1.0.0-M4"
 
 [libraries]
diff --git a/test-suite-mqttv3-graal/src/test/java/io/micronaut/mqtt3/graal/MessageConverterMqttClient.java b/test-suite-mqttv3-graal/src/test/java/io/micronaut/mqtt3/graal/MessageConverterMqttClient.java
index 5eb5a55e..1d953ddc 100644
--- a/test-suite-mqttv3-graal/src/test/java/io/micronaut/mqtt3/graal/MessageConverterMqttClient.java
+++ b/test-suite-mqttv3-graal/src/test/java/io/micronaut/mqtt3/graal/MessageConverterMqttClient.java
@@ -1,7 +1,7 @@
 package io.micronaut.mqtt3.graal;
 
 import io.micronaut.mqtt.annotation.Topic;
-import io.micronaut.mqtt.v3.annotation.MqttPublisher;
+import io.micronaut.mqtt.annotation.v3.MqttPublisher;
 
 @MqttPublisher
 public interface MessageConverterMqttClient {
diff --git a/test-suite-mqttv5-graal/src/test/java/io/micronaut/mqtt5/graal/MessageConverterMqttClient.java b/test-suite-mqttv5-graal/src/test/java/io/micronaut/mqtt5/graal/MessageConverterMqttClient.java
index f81cfd98..d0a026ee 100644
--- a/test-suite-mqttv5-graal/src/test/java/io/micronaut/mqtt5/graal/MessageConverterMqttClient.java
+++ b/test-suite-mqttv5-graal/src/test/java/io/micronaut/mqtt5/graal/MessageConverterMqttClient.java
@@ -1,7 +1,7 @@
 package io.micronaut.mqtt5.graal;
 
 import io.micronaut.mqtt.annotation.Topic;
-import io.micronaut.mqtt.v5.annotation.MqttPublisher;
+import io.micronaut.mqtt.annotation.v5.MqttPublisher;
 
 @MqttPublisher
 public interface MessageConverterMqttClient {