diff --git a/subprojects/micronaut-grails/src/main/groovy/com/agorapulse/micronaut/grails/CompatibilityMode.java b/subprojects/micronaut-grails/src/main/java/com/agorapulse/micronaut/grails/CompatibilityMode.java
similarity index 100%
rename from subprojects/micronaut-grails/src/main/groovy/com/agorapulse/micronaut/grails/CompatibilityMode.java
rename to subprojects/micronaut-grails/src/main/java/com/agorapulse/micronaut/grails/CompatibilityMode.java
diff --git a/subprojects/micronaut-grails/src/main/groovy/com/agorapulse/micronaut/grails/DefaultGrailsMicronautBeanProcessor.java b/subprojects/micronaut-grails/src/main/java/com/agorapulse/micronaut/grails/DefaultGrailsMicronautBeanProcessor.java
similarity index 100%
rename from subprojects/micronaut-grails/src/main/groovy/com/agorapulse/micronaut/grails/DefaultGrailsMicronautBeanProcessor.java
rename to subprojects/micronaut-grails/src/main/java/com/agorapulse/micronaut/grails/DefaultGrailsMicronautBeanProcessor.java
diff --git a/subprojects/micronaut-grails/src/main/groovy/com/agorapulse/micronaut/grails/EnvVarLikeSystemPropertiesPropertySource.java b/subprojects/micronaut-grails/src/main/java/com/agorapulse/micronaut/grails/EnvVarLikeSystemPropertiesPropertySource.java
similarity index 100%
rename from subprojects/micronaut-grails/src/main/groovy/com/agorapulse/micronaut/grails/EnvVarLikeSystemPropertiesPropertySource.java
rename to subprojects/micronaut-grails/src/main/java/com/agorapulse/micronaut/grails/EnvVarLikeSystemPropertiesPropertySource.java
diff --git a/subprojects/micronaut-grails/src/main/groovy/com/agorapulse/micronaut/grails/GrailsMicronautBeanFactory.java b/subprojects/micronaut-grails/src/main/java/com/agorapulse/micronaut/grails/GrailsMicronautBeanFactory.java
similarity index 100%
rename from subprojects/micronaut-grails/src/main/groovy/com/agorapulse/micronaut/grails/GrailsMicronautBeanFactory.java
rename to subprojects/micronaut-grails/src/main/java/com/agorapulse/micronaut/grails/GrailsMicronautBeanFactory.java
diff --git a/subprojects/micronaut-grails/src/main/groovy/com/agorapulse/micronaut/grails/GrailsMicronautBeanProcessor.java b/subprojects/micronaut-grails/src/main/java/com/agorapulse/micronaut/grails/GrailsMicronautBeanProcessor.java
similarity index 100%
rename from subprojects/micronaut-grails/src/main/groovy/com/agorapulse/micronaut/grails/GrailsMicronautBeanProcessor.java
rename to subprojects/micronaut-grails/src/main/java/com/agorapulse/micronaut/grails/GrailsMicronautBeanProcessor.java
diff --git a/subprojects/micronaut-grails/src/main/groovy/com/agorapulse/micronaut/grails/GrailsPropertyTranslatingApplicationContext.java b/subprojects/micronaut-grails/src/main/java/com/agorapulse/micronaut/grails/GrailsPropertyTranslatingApplicationContext.java
similarity index 100%
rename from subprojects/micronaut-grails/src/main/groovy/com/agorapulse/micronaut/grails/GrailsPropertyTranslatingApplicationContext.java
rename to subprojects/micronaut-grails/src/main/java/com/agorapulse/micronaut/grails/GrailsPropertyTranslatingApplicationContext.java
diff --git a/subprojects/micronaut-grails/src/main/groovy/com/agorapulse/micronaut/grails/GrailsPropertyTranslatingCustomizer.java b/subprojects/micronaut-grails/src/main/java/com/agorapulse/micronaut/grails/GrailsPropertyTranslatingCustomizer.java
similarity index 100%
rename from subprojects/micronaut-grails/src/main/groovy/com/agorapulse/micronaut/grails/GrailsPropertyTranslatingCustomizer.java
rename to subprojects/micronaut-grails/src/main/java/com/agorapulse/micronaut/grails/GrailsPropertyTranslatingCustomizer.java
diff --git a/subprojects/micronaut-grails/src/main/groovy/com/agorapulse/micronaut/grails/GrailsPropertyTranslatingEnvironment.java b/subprojects/micronaut-grails/src/main/java/com/agorapulse/micronaut/grails/GrailsPropertyTranslatingEnvironment.java
similarity index 98%
rename from subprojects/micronaut-grails/src/main/groovy/com/agorapulse/micronaut/grails/GrailsPropertyTranslatingEnvironment.java
rename to subprojects/micronaut-grails/src/main/java/com/agorapulse/micronaut/grails/GrailsPropertyTranslatingEnvironment.java
index 9478d770..041d72f2 100644
--- a/subprojects/micronaut-grails/src/main/groovy/com/agorapulse/micronaut/grails/GrailsPropertyTranslatingEnvironment.java
+++ b/subprojects/micronaut-grails/src/main/java/com/agorapulse/micronaut/grails/GrailsPropertyTranslatingEnvironment.java
@@ -86,7 +86,7 @@ public List<String> getEnvironments() {
 
                                 Object currentOrNewMap;
                                 if (expectedPrefix.get().equals(currentKey)) {
-                                    currentOrNewMap = new LinkedHashMap<>();
+                                    currentOrNewMap = multilayer.computeIfAbsent(currentKey, key -> new LinkedHashMap<>());
                                     multilayer.put(currentKey, currentOrNewMap);
                                 } else {
                                     currentOrNewMap = currentLevelMap.computeIfAbsent(part, key -> new LinkedHashMap<>());
diff --git a/subprojects/micronaut-grails/src/main/groovy/com/agorapulse/micronaut/grails/MicronautBeanImporter.java b/subprojects/micronaut-grails/src/main/java/com/agorapulse/micronaut/grails/MicronautBeanImporter.java
similarity index 100%
rename from subprojects/micronaut-grails/src/main/groovy/com/agorapulse/micronaut/grails/MicronautBeanImporter.java
rename to subprojects/micronaut-grails/src/main/java/com/agorapulse/micronaut/grails/MicronautBeanImporter.java
diff --git a/subprojects/micronaut-grails/src/main/groovy/com/agorapulse/micronaut/grails/MicronautContextHolder.java b/subprojects/micronaut-grails/src/main/java/com/agorapulse/micronaut/grails/MicronautContextHolder.java
similarity index 100%
rename from subprojects/micronaut-grails/src/main/groovy/com/agorapulse/micronaut/grails/MicronautContextHolder.java
rename to subprojects/micronaut-grails/src/main/java/com/agorapulse/micronaut/grails/MicronautContextHolder.java
diff --git a/subprojects/micronaut-grails/src/main/groovy/com/agorapulse/micronaut/grails/MicronautGrailsApp.java b/subprojects/micronaut-grails/src/main/java/com/agorapulse/micronaut/grails/MicronautGrailsApp.java
similarity index 100%
rename from subprojects/micronaut-grails/src/main/groovy/com/agorapulse/micronaut/grails/MicronautGrailsApp.java
rename to subprojects/micronaut-grails/src/main/java/com/agorapulse/micronaut/grails/MicronautGrailsApp.java
diff --git a/subprojects/micronaut-grails/src/main/groovy/com/agorapulse/micronaut/grails/MicronautGrailsAppBuilder.java b/subprojects/micronaut-grails/src/main/java/com/agorapulse/micronaut/grails/MicronautGrailsAppBuilder.java
similarity index 100%
rename from subprojects/micronaut-grails/src/main/groovy/com/agorapulse/micronaut/grails/MicronautGrailsAppBuilder.java
rename to subprojects/micronaut-grails/src/main/java/com/agorapulse/micronaut/grails/MicronautGrailsAppBuilder.java
diff --git a/subprojects/micronaut-grails/src/main/groovy/com/agorapulse/micronaut/grails/MicronautGrailsAutoConfiguration.java b/subprojects/micronaut-grails/src/main/java/com/agorapulse/micronaut/grails/MicronautGrailsAutoConfiguration.java
similarity index 100%
rename from subprojects/micronaut-grails/src/main/groovy/com/agorapulse/micronaut/grails/MicronautGrailsAutoConfiguration.java
rename to subprojects/micronaut-grails/src/main/java/com/agorapulse/micronaut/grails/MicronautGrailsAutoConfiguration.java
diff --git a/subprojects/micronaut-grails/src/main/groovy/com/agorapulse/micronaut/grails/MicronautGrailsConfiguration.java b/subprojects/micronaut-grails/src/main/java/com/agorapulse/micronaut/grails/MicronautGrailsConfiguration.java
similarity index 100%
rename from subprojects/micronaut-grails/src/main/groovy/com/agorapulse/micronaut/grails/MicronautGrailsConfiguration.java
rename to subprojects/micronaut-grails/src/main/java/com/agorapulse/micronaut/grails/MicronautGrailsConfiguration.java
diff --git a/subprojects/micronaut-grails/src/main/groovy/com/agorapulse/micronaut/grails/PropertyTranslatingCustomizer.java b/subprojects/micronaut-grails/src/main/java/com/agorapulse/micronaut/grails/PropertyTranslatingCustomizer.java
similarity index 100%
rename from subprojects/micronaut-grails/src/main/groovy/com/agorapulse/micronaut/grails/PropertyTranslatingCustomizer.java
rename to subprojects/micronaut-grails/src/main/java/com/agorapulse/micronaut/grails/PropertyTranslatingCustomizer.java
diff --git a/subprojects/micronaut-grails/src/main/groovy/com/agorapulse/micronaut/grails/TypeAndQualifier.java b/subprojects/micronaut-grails/src/main/java/com/agorapulse/micronaut/grails/TypeAndQualifier.java
similarity index 100%
rename from subprojects/micronaut-grails/src/main/groovy/com/agorapulse/micronaut/grails/TypeAndQualifier.java
rename to subprojects/micronaut-grails/src/main/java/com/agorapulse/micronaut/grails/TypeAndQualifier.java
diff --git a/subprojects/micronaut-grails/src/test/groovy/com/agorapulse/micronaut/grails/SimpleNotificationServiceConfigurationSpec.groovy b/subprojects/micronaut-grails/src/test/groovy/com/agorapulse/micronaut/grails/SimpleNotificationServiceConfigurationSpec.groovy
index 2cecc333..b9c3ddfb 100644
--- a/subprojects/micronaut-grails/src/test/groovy/com/agorapulse/micronaut/grails/SimpleNotificationServiceConfigurationSpec.groovy
+++ b/subprojects/micronaut-grails/src/test/groovy/com/agorapulse/micronaut/grails/SimpleNotificationServiceConfigurationSpec.groovy
@@ -71,6 +71,7 @@ class GrailsSimpleNotificationServiceConfig {
             .addByType(SimpleNotificationService)
             .addByType(SimpleNotificationServiceConfiguration)
             .addByQualifiers('notificationsQueueService', SimpleQueueService, Qualifiers.byName('notifications'))
+            .addByQualifiers('syncQueueService', SimpleQueueService, Qualifiers.byName('notification-manager-device-sync'))
             .createMapForPropertiesStarting('aws.sqs.queues')
     }
 
diff --git a/subprojects/micronaut-grails/src/test/resources/com/agorapulse/micronaut/grails/SimpleNotificationServiceConfigurationSpec.properties b/subprojects/micronaut-grails/src/test/resources/com/agorapulse/micronaut/grails/SimpleNotificationServiceConfigurationSpec.properties
index edc4725f..09291907 100644
--- a/subprojects/micronaut-grails/src/test/resources/com/agorapulse/micronaut/grails/SimpleNotificationServiceConfigurationSpec.properties
+++ b/subprojects/micronaut-grails/src/test/resources/com/agorapulse/micronaut/grails/SimpleNotificationServiceConfigurationSpec.properties
@@ -18,3 +18,4 @@
 
 grails.plugin.awssdk.sns.android.applicationArn = arn::dummy
 aws.sqs.queues.notifications.queue = beta_notifications
+aws.sqs.queues.notification-manager-device-sync.queue = beta_sync_queue