diff --git a/modules/flowable-app-engine/src/main/java/org/flowable/app/engine/impl/aot/FlowableAppRuntimeHints.java b/modules/flowable-app-engine/src/main/java/org/flowable/app/engine/impl/aot/FlowableAppRuntimeHints.java
index 901e525947a..f12c62be81c 100644
--- a/modules/flowable-app-engine/src/main/java/org/flowable/app/engine/impl/aot/FlowableAppRuntimeHints.java
+++ b/modules/flowable-app-engine/src/main/java/org/flowable/app/engine/impl/aot/FlowableAppRuntimeHints.java
@@ -13,6 +13,7 @@
 package org.flowable.app.engine.impl.aot;
 
 import org.flowable.common.engine.impl.aot.FlowableMyBatisResourceHintsRegistrar;
+import org.flowable.common.engine.impl.aot.FlowableSqlResourceHintsRegistrar;
 import org.springframework.aot.hint.ResourceHints;
 import org.springframework.aot.hint.RuntimeHints;
 import org.springframework.aot.hint.RuntimeHintsRegistrar;
@@ -26,5 +27,6 @@ public class FlowableAppRuntimeHints implements RuntimeHintsRegistrar {
     public void registerHints(RuntimeHints hints, ClassLoader classLoader) {
         ResourceHints resourceHints = hints.resources();
         FlowableMyBatisResourceHintsRegistrar.registerMappingResources("org/flowable/app/db/mapping", hints, classLoader);
+        FlowableSqlResourceHintsRegistrar.registerSqlResources("org/flowable/app/db", resourceHints);
     }
 }
diff --git a/modules/flowable-batch-service/src/main/java/org/flowable/batch/service/impl/aot/FlowableBatchServiceRuntimeHints.java b/modules/flowable-batch-service/src/main/java/org/flowable/batch/service/impl/aot/FlowableBatchServiceRuntimeHints.java
deleted file mode 100644
index baba6d34262..00000000000
--- a/modules/flowable-batch-service/src/main/java/org/flowable/batch/service/impl/aot/FlowableBatchServiceRuntimeHints.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/* Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.flowable.batch.service.impl.aot;
-
-import org.flowable.common.engine.impl.aot.FlowableSqlResourceHintsRegistrar;
-import org.springframework.aot.hint.ResourceHints;
-import org.springframework.aot.hint.RuntimeHints;
-import org.springframework.aot.hint.RuntimeHintsRegistrar;
-
-/**
- * @author Filip Hrisafov
- */
-public class FlowableBatchServiceRuntimeHints implements RuntimeHintsRegistrar {
-
-    @Override
-    public void registerHints(RuntimeHints hints, ClassLoader classLoader) {
-        ResourceHints resourceHints = hints.resources();
-        FlowableSqlResourceHintsRegistrar.registerSqlResources("org/flowable/batch/service/db", resourceHints);
-
-    }
-}
diff --git a/modules/flowable-batch-service/src/main/resources/META-INF/spring/aot.factories b/modules/flowable-batch-service/src/main/resources/META-INF/spring/aot.factories
deleted file mode 100644
index 2a04bc04f27..00000000000
--- a/modules/flowable-batch-service/src/main/resources/META-INF/spring/aot.factories
+++ /dev/null
@@ -1,2 +0,0 @@
-org.springframework.aot.hint.RuntimeHintsRegistrar=\
-org.flowable.batch.service.impl.aot.FlowableBatchServiceRuntimeHints
diff --git a/modules/flowable-cmmn-engine/src/main/java/org/flowable/cmmn/engine/impl/aot/FlowableCmmnRuntimeHints.java b/modules/flowable-cmmn-engine/src/main/java/org/flowable/cmmn/engine/impl/aot/FlowableCmmnRuntimeHints.java
index e0641134e42..9e14aa90853 100644
--- a/modules/flowable-cmmn-engine/src/main/java/org/flowable/cmmn/engine/impl/aot/FlowableCmmnRuntimeHints.java
+++ b/modules/flowable-cmmn-engine/src/main/java/org/flowable/cmmn/engine/impl/aot/FlowableCmmnRuntimeHints.java
@@ -13,6 +13,7 @@
 package org.flowable.cmmn.engine.impl.aot;
 
 import org.flowable.common.engine.impl.aot.FlowableMyBatisResourceHintsRegistrar;
+import org.flowable.common.engine.impl.aot.FlowableSqlResourceHintsRegistrar;
 import org.flowable.variable.service.impl.QueryVariableValue;
 import org.springframework.aot.hint.MemberCategory;
 import org.springframework.aot.hint.ResourceHints;
@@ -29,6 +30,7 @@ public void registerHints(RuntimeHints hints, ClassLoader classLoader) {
         ResourceHints resourceHints = hints.resources();
         FlowableMyBatisResourceHintsRegistrar.registerMappingResources("org/flowable/cmmn/db/mapping", hints, classLoader);
         resourceHints.registerPattern("org/flowable/impl/cmmn/parser/*.xsd");
+        FlowableSqlResourceHintsRegistrar.registerSqlResources("org/flowable/cmmn/db", resourceHints);
 
         hints.reflection()
                 .registerType(QueryVariableValue.class, MemberCategory.INVOKE_PUBLIC_METHODS);
diff --git a/modules/flowable-dmn-engine/src/main/java/org/flowable/dmn/engine/impl/aot/FlowableDmnRuntimeHints.java b/modules/flowable-dmn-engine/src/main/java/org/flowable/dmn/engine/impl/aot/FlowableDmnRuntimeHints.java
index d6805ba2761..10a22839fde 100644
--- a/modules/flowable-dmn-engine/src/main/java/org/flowable/dmn/engine/impl/aot/FlowableDmnRuntimeHints.java
+++ b/modules/flowable-dmn-engine/src/main/java/org/flowable/dmn/engine/impl/aot/FlowableDmnRuntimeHints.java
@@ -13,6 +13,7 @@
 package org.flowable.dmn.engine.impl.aot;
 
 import org.flowable.common.engine.impl.aot.FlowableMyBatisResourceHintsRegistrar;
+import org.flowable.common.engine.impl.aot.FlowableSqlResourceHintsRegistrar;
 import org.springframework.aot.hint.ResourceHints;
 import org.springframework.aot.hint.RuntimeHints;
 import org.springframework.aot.hint.RuntimeHintsRegistrar;
@@ -26,6 +27,7 @@ public class FlowableDmnRuntimeHints implements RuntimeHintsRegistrar {
     public void registerHints(RuntimeHints hints, ClassLoader classLoader) {
         ResourceHints resourceHints = hints.resources();
         FlowableMyBatisResourceHintsRegistrar.registerMappingResources("org/flowable/dmn/db/mapping", hints, classLoader);
+        FlowableSqlResourceHintsRegistrar.registerSqlResources("org/flowable/dmn/db", resourceHints);
         resourceHints.registerPattern("org/flowable/impl/dmn/parser/*.xsd");
     }
 }
diff --git a/modules/flowable-entitylink-service/src/main/java/org/flowable/entitylink/service/impl/aot/FlowableEntityLinkServiceRuntimeHints.java b/modules/flowable-entitylink-service/src/main/java/org/flowable/entitylink/service/impl/aot/FlowableEntityLinkServiceRuntimeHints.java
deleted file mode 100644
index e2554e29758..00000000000
--- a/modules/flowable-entitylink-service/src/main/java/org/flowable/entitylink/service/impl/aot/FlowableEntityLinkServiceRuntimeHints.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/* Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.flowable.entitylink.service.impl.aot;
-
-import org.flowable.common.engine.impl.aot.FlowableSqlResourceHintsRegistrar;
-import org.springframework.aot.hint.ResourceHints;
-import org.springframework.aot.hint.RuntimeHints;
-import org.springframework.aot.hint.RuntimeHintsRegistrar;
-
-/**
- * @author Filip Hrisafov
- */
-public class FlowableEntityLinkServiceRuntimeHints implements RuntimeHintsRegistrar {
-
-    @Override
-    public void registerHints(RuntimeHints hints, ClassLoader classLoader) {
-        ResourceHints resourceHints = hints.resources();
-        FlowableSqlResourceHintsRegistrar.registerSqlResources("org/flowable/entitylink/service/db", resourceHints);
-
-    }
-}
diff --git a/modules/flowable-entitylink-service/src/main/resources/META-INF/spring/aot.factories b/modules/flowable-entitylink-service/src/main/resources/META-INF/spring/aot.factories
deleted file mode 100644
index 05444f89a41..00000000000
--- a/modules/flowable-entitylink-service/src/main/resources/META-INF/spring/aot.factories
+++ /dev/null
@@ -1,2 +0,0 @@
-org.springframework.aot.hint.RuntimeHintsRegistrar=\
-org.flowable.entitylink.service.impl.aot.FlowableEntityLinkServiceRuntimeHints
diff --git a/modules/flowable-event-registry/src/main/java/org/flowable/eventregistry/impl/aot/FlowableEventRegistryRuntimeHints.java b/modules/flowable-event-registry/src/main/java/org/flowable/eventregistry/impl/aot/FlowableEventRegistryRuntimeHints.java
index 735b90ed6f4..0ab8e5517b1 100644
--- a/modules/flowable-event-registry/src/main/java/org/flowable/eventregistry/impl/aot/FlowableEventRegistryRuntimeHints.java
+++ b/modules/flowable-event-registry/src/main/java/org/flowable/eventregistry/impl/aot/FlowableEventRegistryRuntimeHints.java
@@ -13,8 +13,10 @@
 package org.flowable.eventregistry.impl.aot;
 
 import org.flowable.common.engine.impl.aot.FlowableMyBatisResourceHintsRegistrar;
+import org.flowable.common.engine.impl.aot.FlowableSqlResourceHintsRegistrar;
 import org.flowable.eventregistry.impl.persistence.ResourceRefTypeHandler;
 import org.springframework.aot.hint.MemberCategory;
+import org.springframework.aot.hint.ResourceHints;
 import org.springframework.aot.hint.RuntimeHints;
 import org.springframework.aot.hint.RuntimeHintsRegistrar;
 
@@ -28,5 +30,7 @@ public void registerHints(RuntimeHints hints, ClassLoader classLoader) {
         FlowableMyBatisResourceHintsRegistrar.registerMappingResources("org/flowable/eventregistry/db/mapping", hints, classLoader);
         hints.reflection()
                 .registerType(ResourceRefTypeHandler.class, MemberCategory.values());
+        ResourceHints resourceHints = hints.resources();
+        FlowableSqlResourceHintsRegistrar.registerSqlResources("org/flowable/eventregistry/db", resourceHints);
     }
 }
diff --git a/modules/flowable-eventsubscription-service/src/main/java/org/flowable/eventsubscription/service/impl/aot/FlowableEventSubscriptionServiceRuntimeHints.java b/modules/flowable-eventsubscription-service/src/main/java/org/flowable/eventsubscription/service/impl/aot/FlowableEventSubscriptionServiceRuntimeHints.java
deleted file mode 100644
index 10626b2e586..00000000000
--- a/modules/flowable-eventsubscription-service/src/main/java/org/flowable/eventsubscription/service/impl/aot/FlowableEventSubscriptionServiceRuntimeHints.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/* Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.flowable.eventsubscription.service.impl.aot;
-
-import org.flowable.common.engine.impl.aot.FlowableSqlResourceHintsRegistrar;
-import org.springframework.aot.hint.ResourceHints;
-import org.springframework.aot.hint.RuntimeHints;
-import org.springframework.aot.hint.RuntimeHintsRegistrar;
-
-/**
- * @author Filip Hrisafov
- */
-public class FlowableEventSubscriptionServiceRuntimeHints implements RuntimeHintsRegistrar {
-
-    @Override
-    public void registerHints(RuntimeHints hints, ClassLoader classLoader) {
-        ResourceHints resourceHints = hints.resources();
-        FlowableSqlResourceHintsRegistrar.registerSqlResources("org/flowable/eventsubscription/service/db", resourceHints);
-    }
-}
diff --git a/modules/flowable-eventsubscription-service/src/main/resources/META-INF/spring/aot.factories b/modules/flowable-eventsubscription-service/src/main/resources/META-INF/spring/aot.factories
deleted file mode 100644
index 34decbb0ccf..00000000000
--- a/modules/flowable-eventsubscription-service/src/main/resources/META-INF/spring/aot.factories
+++ /dev/null
@@ -1,3 +0,0 @@
-org.springframework.aot.hint.RuntimeHintsRegistrar=\
-org.flowable.eventsubscription.service.impl.aot.FlowableEventSubscriptionServiceRuntimeHints
-
diff --git a/modules/flowable-identitylink-service/src/main/java/org/flowable/identitylink/service/impl/aot/FlowableIdentityLinkServiceRuntimeHints.java b/modules/flowable-identitylink-service/src/main/java/org/flowable/identitylink/service/impl/aot/FlowableIdentityLinkServiceRuntimeHints.java
deleted file mode 100644
index 3c33e7770a4..00000000000
--- a/modules/flowable-identitylink-service/src/main/java/org/flowable/identitylink/service/impl/aot/FlowableIdentityLinkServiceRuntimeHints.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/* Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.flowable.identitylink.service.impl.aot;
-
-import org.flowable.common.engine.impl.aot.FlowableSqlResourceHintsRegistrar;
-import org.springframework.aot.hint.ResourceHints;
-import org.springframework.aot.hint.RuntimeHints;
-import org.springframework.aot.hint.RuntimeHintsRegistrar;
-
-/**
- * @author Filip Hrisafov
- */
-public class FlowableIdentityLinkServiceRuntimeHints implements RuntimeHintsRegistrar {
-
-    @Override
-    public void registerHints(RuntimeHints hints, ClassLoader classLoader) {
-        ResourceHints resourceHints = hints.resources();
-        FlowableSqlResourceHintsRegistrar.registerSqlResources("org/flowable/identitylink/service/db", resourceHints);
-    }
-}
diff --git a/modules/flowable-identitylink-service/src/main/resources/META-INF/spring/aot.factories b/modules/flowable-identitylink-service/src/main/resources/META-INF/spring/aot.factories
deleted file mode 100644
index e4a1a9f2cea..00000000000
--- a/modules/flowable-identitylink-service/src/main/resources/META-INF/spring/aot.factories
+++ /dev/null
@@ -1,2 +0,0 @@
-org.springframework.aot.hint.RuntimeHintsRegistrar=\
-org.flowable.identitylink.service.impl.aot.FlowableIdentityLinkServiceRuntimeHints
diff --git a/modules/flowable-job-service/src/main/java/org/flowable/job/service/impl/aot/FlowableJobServiceRuntimeHints.java b/modules/flowable-job-service/src/main/java/org/flowable/job/service/impl/aot/FlowableJobServiceRuntimeHints.java
deleted file mode 100644
index 5205999a340..00000000000
--- a/modules/flowable-job-service/src/main/java/org/flowable/job/service/impl/aot/FlowableJobServiceRuntimeHints.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/* Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.flowable.job.service.impl.aot;
-
-import org.flowable.common.engine.impl.aot.FlowableSqlResourceHintsRegistrar;
-import org.springframework.aot.hint.ResourceHints;
-import org.springframework.aot.hint.RuntimeHints;
-import org.springframework.aot.hint.RuntimeHintsRegistrar;
-
-/**
- * @author Filip Hrisafov
- */
-public class FlowableJobServiceRuntimeHints implements RuntimeHintsRegistrar {
-
-    @Override
-    public void registerHints(RuntimeHints hints, ClassLoader classLoader) {
-        ResourceHints resourceHints = hints.resources();
-        FlowableSqlResourceHintsRegistrar.registerSqlResources("org/flowable/job/service/db", resourceHints);
-    }
-}
diff --git a/modules/flowable-job-service/src/main/resources/META-INF/spring/aot.factories b/modules/flowable-job-service/src/main/resources/META-INF/spring/aot.factories
deleted file mode 100644
index df8363ddf25..00000000000
--- a/modules/flowable-job-service/src/main/resources/META-INF/spring/aot.factories
+++ /dev/null
@@ -1,2 +0,0 @@
-org.springframework.aot.hint.RuntimeHintsRegistrar=\
-org.flowable.job.service.impl.aot.FlowableJobServiceRuntimeHints
diff --git a/modules/flowable-task-service/src/main/java/org/flowable/task/service/impl/aot/FlowableTaskServiceRuntimeHints.java b/modules/flowable-task-service/src/main/java/org/flowable/task/service/impl/aot/FlowableTaskServiceRuntimeHints.java
deleted file mode 100644
index d69afabbe49..00000000000
--- a/modules/flowable-task-service/src/main/java/org/flowable/task/service/impl/aot/FlowableTaskServiceRuntimeHints.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/* Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.flowable.task.service.impl.aot;
-
-import org.flowable.common.engine.impl.aot.FlowableSqlResourceHintsRegistrar;
-import org.springframework.aot.hint.ResourceHints;
-import org.springframework.aot.hint.RuntimeHints;
-import org.springframework.aot.hint.RuntimeHintsRegistrar;
-
-/**
- * @author Filip Hrisafov
- */
-public class FlowableTaskServiceRuntimeHints implements RuntimeHintsRegistrar {
-
-    @Override
-    public void registerHints(RuntimeHints hints, ClassLoader classLoader) {
-        ResourceHints resourceHints = hints.resources();
-        FlowableSqlResourceHintsRegistrar.registerSqlResources("org/flowable/task/service/db", resourceHints);
-    }
-}
diff --git a/modules/flowable-task-service/src/main/resources/META-INF/spring/aot.factories b/modules/flowable-task-service/src/main/resources/META-INF/spring/aot.factories
deleted file mode 100644
index 67fb77a12ab..00000000000
--- a/modules/flowable-task-service/src/main/resources/META-INF/spring/aot.factories
+++ /dev/null
@@ -1,2 +0,0 @@
-org.springframework.aot.hint.RuntimeHintsRegistrar=\
-org.flowable.task.service.impl.aot.FlowableTaskServiceRuntimeHints
diff --git a/modules/flowable-variable-service/src/main/java/org/flowable/variable/service/impl/aot/FlowableVariableServiceRuntimeHints.java b/modules/flowable-variable-service/src/main/java/org/flowable/variable/service/impl/aot/FlowableVariableServiceRuntimeHints.java
deleted file mode 100644
index da85a787439..00000000000
--- a/modules/flowable-variable-service/src/main/java/org/flowable/variable/service/impl/aot/FlowableVariableServiceRuntimeHints.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/* Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.flowable.variable.service.impl.aot;
-
-import org.flowable.common.engine.impl.aot.FlowableSqlResourceHintsRegistrar;
-import org.flowable.variable.service.impl.db.IbatisVariableTypeHandler;
-import org.springframework.aot.hint.MemberCategory;
-import org.springframework.aot.hint.ResourceHints;
-import org.springframework.aot.hint.RuntimeHints;
-import org.springframework.aot.hint.RuntimeHintsRegistrar;
-
-/**
- * @author Filip Hrisafov
- */
-public class FlowableVariableServiceRuntimeHints implements RuntimeHintsRegistrar {
-
-    @Override
-    public void registerHints(RuntimeHints hints, ClassLoader classLoader) {
-        ResourceHints resourceHints = hints.resources();
-        FlowableSqlResourceHintsRegistrar.registerSqlResources("org/flowable/variable/service/db", resourceHints);
-        hints.reflection()
-                .registerType(IbatisVariableTypeHandler.class, MemberCategory.values());
-    }
-}
diff --git a/modules/flowable-variable-service/src/main/resources/META-INF/spring/aot.factories b/modules/flowable-variable-service/src/main/resources/META-INF/spring/aot.factories
deleted file mode 100644
index 45df3f88e19..00000000000
--- a/modules/flowable-variable-service/src/main/resources/META-INF/spring/aot.factories
+++ /dev/null
@@ -1,2 +0,0 @@
-org.springframework.aot.hint.RuntimeHintsRegistrar=\
-org.flowable.variable.service.impl.aot.FlowableVariableServiceRuntimeHints