diff --git a/pom.xml b/pom.xml
index eb8ecc58..090f8cc9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -53,7 +53,7 @@
         <version.junit.jupiter>5.7.0</version.junit.jupiter>
 
         <version.io.rest-assured>4.3.1</version.io.rest-assured>
-        <version.lombok>1.18.20</version.lombok>
+        <version.lombok>1.18.42</version.lombok>
         <version.org.hamcrest>1.3</version.org.hamcrest>
         <version.mockito.core>4.9.0</version.mockito.core>
         <version.logback>1.2.13</version.logback>
diff --git a/provisioners/pom.xml b/provisioners/pom.xml
index fc44443d..5b3d51f8 100644
--- a/provisioners/pom.xml
+++ b/provisioners/pom.xml
@@ -232,13 +232,93 @@
                 <artifactId>java-generator-maven-plugin</artifactId>
                 <executions>
                     <execution>
-                        <id>default-crd-generation</id>
+                        <id>default-crd-generation-broker_activemqartemis</id>
                         <goals>
                             <goal>generate</goal>
                         </goals>
                         <configuration>
                             <target>target/generated-sources</target>
-                            <source>src/main/resources/crds/default</source>
+                            <source>src/main/resources/crds/default/broker_activemqartemis</source>
+                            <!--
+                                This is needed to force the Java generator from CRD to stick with the original names
+                                for enums, and avoid to uppercase them, since this could generate duplicate names,
+                                as in https://github.com/infinispan/infinispan-operator/blob/2.3.4.Final/config/crd/bases/infinispan.org_infinispans.yaml#L1473-L1477
+                             -->
+                            <enumUppercase>false</enumUppercase>
+                            <!--
+                                The following is required in order to generate Sundrio and Lombok annotations
+                            -->
+                            <extraAnnotations>true</extraAnnotations>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>default-crd-generation-infinispan</id>
+                        <goals>
+                            <goal>generate</goal>
+                        </goals>
+                        <configuration>
+                            <target>target/generated-sources</target>
+                            <source>src/main/resources/crds/default/infinispan</source>
+                            <!--
+                                This is needed to force the Java generator from CRD to stick with the original names
+                                for enums, and avoid to uppercase them, since this could generate duplicate names,
+                                as in https://github.com/infinispan/infinispan-operator/blob/2.3.4.Final/config/crd/bases/infinispan.org_infinispans.yaml#L1473-L1477
+                             -->
+                            <enumUppercase>false</enumUppercase>
+                            <!--
+                                The following is required in order to generate Sundrio and Lombok annotations
+                            -->
+                            <extraAnnotations>true</extraAnnotations>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>default-crd-generation-keycloak</id>
+                        <goals>
+                            <goal>generate</goal>
+                        </goals>
+                        <configuration>
+                            <target>target/generated-sources</target>
+                            <source>src/main/resources/crds/default/keycloak</source>
+                            <!--
+                                This is needed to force the Java generator from CRD to stick with the original names
+                                for enums, and avoid to uppercase them, since this could generate duplicate names,
+                                as in https://github.com/infinispan/infinispan-operator/blob/2.3.4.Final/config/crd/bases/infinispan.org_infinispans.yaml#L1473-L1477
+                             -->
+                            <enumUppercase>false</enumUppercase>
+                            <!--
+                                The following is required in order to generate Sundrio and Lombok annotations
+                            -->
+                            <extraAnnotations>true</extraAnnotations>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>default-crd-generation-opendatahub</id>
+                        <goals>
+                            <goal>generate</goal>
+                        </goals>
+                        <configuration>
+                            <target>target/generated-sources</target>
+                            <source>src/main/resources/crds/default/opendatahub</source>
+                            <!--
+                                This is needed to force the Java generator from CRD to stick with the original names
+                                for enums, and avoid to uppercase them, since this could generate duplicate names,
+                                as in https://github.com/infinispan/infinispan-operator/blob/2.3.4.Final/config/crd/bases/infinispan.org_infinispans.yaml#L1473-L1477
+                             -->
+                            <enumUppercase>false</enumUppercase>
+                            <!--
+                                The following is required in order to generate Sundrio and Lombok annotations
+                            -->
+                            <extraAnnotations>true</extraAnnotations>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>default-crd-generation-wildfly</id>
+                        <goals>
+                            <goal>generate</goal>
+                        </goals>
+                        <configuration>
+                            <target>target/generated-sources</target>
+                            <source>src/main/resources/crds/default/wildfly</source>
                             <!--
                                 This is needed to force the Java generator from CRD to stick with the original names
                                 for enums, and avoid to uppercase them, since this could generate duplicate names,
diff --git a/provisioners/src/main/resources/crds/default/broker_activemqartemis_crd.yaml b/provisioners/src/main/resources/crds/default/broker_activemqartemis/broker_activemqartemis_crd.yaml
similarity index 100%
rename from provisioners/src/main/resources/crds/default/broker_activemqartemis_crd.yaml
rename to provisioners/src/main/resources/crds/default/broker_activemqartemis/broker_activemqartemis_crd.yaml
diff --git a/provisioners/src/main/resources/crds/default/broker_activemqartemisaddress_crd.yaml b/provisioners/src/main/resources/crds/default/broker_activemqartemis/broker_activemqartemisaddress_crd.yaml
similarity index 100%
rename from provisioners/src/main/resources/crds/default/broker_activemqartemisaddress_crd.yaml
rename to provisioners/src/main/resources/crds/default/broker_activemqartemis/broker_activemqartemisaddress_crd.yaml
diff --git a/provisioners/src/main/resources/crds/default/broker_activemqartemisscaledown_crd.yaml b/provisioners/src/main/resources/crds/default/broker_activemqartemis/broker_activemqartemisscaledown_crd.yaml
similarity index 100%
rename from provisioners/src/main/resources/crds/default/broker_activemqartemisscaledown_crd.yaml
rename to provisioners/src/main/resources/crds/default/broker_activemqartemis/broker_activemqartemisscaledown_crd.yaml
diff --git a/provisioners/src/main/resources/crds/default/broker_activemqartemissecurity_crd.yaml b/provisioners/src/main/resources/crds/default/broker_activemqartemis/broker_activemqartemissecurity_crd.yaml
similarity index 100%
rename from provisioners/src/main/resources/crds/default/broker_activemqartemissecurity_crd.yaml
rename to provisioners/src/main/resources/crds/default/broker_activemqartemis/broker_activemqartemissecurity_crd.yaml
diff --git a/provisioners/src/main/resources/crds/default/infinispan.org_backups.yaml b/provisioners/src/main/resources/crds/default/infinispan/infinispan.org_backups.yaml
similarity index 100%
rename from provisioners/src/main/resources/crds/default/infinispan.org_backups.yaml
rename to provisioners/src/main/resources/crds/default/infinispan/infinispan.org_backups.yaml
diff --git a/provisioners/src/main/resources/crds/default/infinispan.org_batches.yaml b/provisioners/src/main/resources/crds/default/infinispan/infinispan.org_batches.yaml
similarity index 100%
rename from provisioners/src/main/resources/crds/default/infinispan.org_batches.yaml
rename to provisioners/src/main/resources/crds/default/infinispan/infinispan.org_batches.yaml
diff --git a/provisioners/src/main/resources/crds/default/infinispan.org_caches.yaml b/provisioners/src/main/resources/crds/default/infinispan/infinispan.org_caches.yaml
similarity index 100%
rename from provisioners/src/main/resources/crds/default/infinispan.org_caches.yaml
rename to provisioners/src/main/resources/crds/default/infinispan/infinispan.org_caches.yaml
diff --git a/provisioners/src/main/resources/crds/default/infinispan.org_infinispans.yaml b/provisioners/src/main/resources/crds/default/infinispan/infinispan.org_infinispans.yaml
similarity index 100%
rename from provisioners/src/main/resources/crds/default/infinispan.org_infinispans.yaml
rename to provisioners/src/main/resources/crds/default/infinispan/infinispan.org_infinispans.yaml
diff --git a/provisioners/src/main/resources/crds/default/infinispan.org_restores.yaml b/provisioners/src/main/resources/crds/default/infinispan/infinispan.org_restores.yaml
similarity index 100%
rename from provisioners/src/main/resources/crds/default/infinispan.org_restores.yaml
rename to provisioners/src/main/resources/crds/default/infinispan/infinispan.org_restores.yaml
diff --git a/provisioners/src/main/resources/crds/default/keycloak.org_keycloakbackups_crd.yaml b/provisioners/src/main/resources/crds/default/keycloak/keycloak.org_keycloakbackups_crd.yaml
similarity index 100%
rename from provisioners/src/main/resources/crds/default/keycloak.org_keycloakbackups_crd.yaml
rename to provisioners/src/main/resources/crds/default/keycloak/keycloak.org_keycloakbackups_crd.yaml
diff --git a/provisioners/src/main/resources/crds/default/keycloak.org_keycloakclients_crd.yaml b/provisioners/src/main/resources/crds/default/keycloak/keycloak.org_keycloakclients_crd.yaml
similarity index 100%
rename from provisioners/src/main/resources/crds/default/keycloak.org_keycloakclients_crd.yaml
rename to provisioners/src/main/resources/crds/default/keycloak/keycloak.org_keycloakclients_crd.yaml
diff --git a/provisioners/src/main/resources/crds/default/keycloak.org_keycloakrealms_crd.yaml b/provisioners/src/main/resources/crds/default/keycloak/keycloak.org_keycloakrealms_crd.yaml
similarity index 100%
rename from provisioners/src/main/resources/crds/default/keycloak.org_keycloakrealms_crd.yaml
rename to provisioners/src/main/resources/crds/default/keycloak/keycloak.org_keycloakrealms_crd.yaml
diff --git a/provisioners/src/main/resources/crds/default/keycloak.org_keycloaks_crd.yaml b/provisioners/src/main/resources/crds/default/keycloak/keycloak.org_keycloaks_crd.yaml
similarity index 100%
rename from provisioners/src/main/resources/crds/default/keycloak.org_keycloaks_crd.yaml
rename to provisioners/src/main/resources/crds/default/keycloak/keycloak.org_keycloaks_crd.yaml
diff --git a/provisioners/src/main/resources/crds/default/keycloak.org_keycloakusers_crd.yaml b/provisioners/src/main/resources/crds/default/keycloak/keycloak.org_keycloakusers_crd.yaml
similarity index 100%
rename from provisioners/src/main/resources/crds/default/keycloak.org_keycloakusers_crd.yaml
rename to provisioners/src/main/resources/crds/default/keycloak/keycloak.org_keycloakusers_crd.yaml
diff --git a/provisioners/src/main/resources/crds/default/keycloakrealmimports.k8s.keycloak.org-v1.yml b/provisioners/src/main/resources/crds/default/keycloak/keycloakrealmimports.k8s.keycloak.org-v1.yml
similarity index 100%
rename from provisioners/src/main/resources/crds/default/keycloakrealmimports.k8s.keycloak.org-v1.yml
rename to provisioners/src/main/resources/crds/default/keycloak/keycloakrealmimports.k8s.keycloak.org-v1.yml
diff --git a/provisioners/src/main/resources/crds/default/keycloaks.k8s.keycloak.org-v1.yml b/provisioners/src/main/resources/crds/default/keycloak/keycloaks.k8s.keycloak.org-v1.yml
similarity index 100%
rename from provisioners/src/main/resources/crds/default/keycloaks.k8s.keycloak.org-v1.yml
rename to provisioners/src/main/resources/crds/default/keycloak/keycloaks.k8s.keycloak.org-v1.yml
diff --git a/provisioners/src/main/resources/crds/default/datasciencecluster.opendatahub.io_datascienceclusters.yaml b/provisioners/src/main/resources/crds/default/opendatahub/datasciencecluster.opendatahub.io_datascienceclusters.yaml
similarity index 100%
rename from provisioners/src/main/resources/crds/default/datasciencecluster.opendatahub.io_datascienceclusters.yaml
rename to provisioners/src/main/resources/crds/default/opendatahub/datasciencecluster.opendatahub.io_datascienceclusters.yaml
diff --git a/provisioners/src/main/resources/crds/default/dscinitialization.opendatahub.io_dscinitializations.yaml b/provisioners/src/main/resources/crds/default/opendatahub/dscinitialization.opendatahub.io_dscinitializations.yaml
similarity index 100%
rename from provisioners/src/main/resources/crds/default/dscinitialization.opendatahub.io_dscinitializations.yaml
rename to provisioners/src/main/resources/crds/default/opendatahub/dscinitialization.opendatahub.io_dscinitializations.yaml
diff --git a/provisioners/src/main/resources/crds/default/features.opendatahub.io_featuretrackers.yaml b/provisioners/src/main/resources/crds/default/opendatahub/features.opendatahub.io_featuretrackers.yaml
similarity index 100%
rename from provisioners/src/main/resources/crds/default/features.opendatahub.io_featuretrackers.yaml
rename to provisioners/src/main/resources/crds/default/opendatahub/features.opendatahub.io_featuretrackers.yaml
diff --git a/provisioners/src/main/resources/crds/default/services.platform.opendatahub.io_auths.yaml b/provisioners/src/main/resources/crds/default/opendatahub/services.platform.opendatahub.io_auths.yaml
similarity index 100%
rename from provisioners/src/main/resources/crds/default/services.platform.opendatahub.io_auths.yaml
rename to provisioners/src/main/resources/crds/default/opendatahub/services.platform.opendatahub.io_auths.yaml
diff --git a/provisioners/src/main/resources/crds/default/services.platform.opendatahub.io_monitorings.yaml b/provisioners/src/main/resources/crds/default/opendatahub/services.platform.opendatahub.io_monitorings.yaml
similarity index 100%
rename from provisioners/src/main/resources/crds/default/services.platform.opendatahub.io_monitorings.yaml
rename to provisioners/src/main/resources/crds/default/opendatahub/services.platform.opendatahub.io_monitorings.yaml
diff --git a/provisioners/src/main/resources/crds/default/wildfly.org_wildflyservers_crd.yaml b/provisioners/src/main/resources/crds/default/wildfly/wildfly.org_wildflyservers_crd.yaml
similarity index 100%
rename from provisioners/src/main/resources/crds/default/wildfly.org_wildflyservers_crd.yaml
rename to provisioners/src/main/resources/crds/default/wildfly/wildfly.org_wildflyservers_crd.yaml